X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseModel.php;h=768e9e9e53d5190e4f9277e9e7531b2d9284e5c9;hb=1ccf22a496f7c05c2ab9b6288d0754215b3d65de;hp=4e4259170872ea23977c24ef7a425f52b4675575;hpb=9827e933a2a1b8e93f293d4e6293384126e5784c;p=friendica.git diff --git a/src/BaseModel.php b/src/BaseModel.php index 4e42591708..768e9e9e53 100644 --- a/src/BaseModel.php +++ b/src/BaseModel.php @@ -1,4 +1,23 @@ . + * + */ namespace Friendica; @@ -12,7 +31,7 @@ use Psr\Log\LoggerInterface; * * @property int id */ -abstract class BaseModel +abstract class BaseModel extends BaseDataTransferObject { /** @var Database */ protected $dba; @@ -48,7 +67,7 @@ abstract class BaseModel $this->originalData = $data; } - public function getOriginalData() + public function getOriginalData(): array { return $this->originalData; } @@ -65,7 +84,7 @@ abstract class BaseModel * @param array $data * @return BaseModel */ - public static function createFromPrototype(BaseModel $prototype, array $data) + public static function createFromPrototype(BaseModel $prototype, array $data): BaseModel { $model = clone $prototype; $model->data = $data; @@ -81,7 +100,7 @@ abstract class BaseModel * @param $name * @return bool */ - public function __isset($name) + public function __isset($name): bool { return in_array($name, array_merge(array_keys($this->data), array_keys(get_object_vars($this)))); } @@ -107,22 +126,26 @@ abstract class BaseModel } /** + * * Magic setter. This allows to set model fields with the following syntax: + * - $model->field = $value (outside of class) + * - $this->field = $value (inside of class) + * * @param string $name - * @param mixed $value + * @param mixed $value */ - public function __set($name, $value) + public function __set(string $name, $value) { $this->data[$name] = $value; } - public function toArray() + public function toArray(): array { return $this->data; } protected function checkValid() { - if (empty($this->data['id'])) { + if (!isset($this->data['id']) || is_null($this->data['id'])) { throw new HTTPException\InternalServerErrorException(static::class . ' record uninitialized'); } }