Remove deprecated code

[friendica.git] / src / BaseModel.php

diff --git a/src/BaseModel.php b/src/BaseModel.php
index 5a27089143d8ab48ff52cf3f4be5b43799a91ae1..2c952888b2e54edb766856756e7124252d70ced7 100644 (file)
--- a/src/BaseModel.php
+++ b/src/BaseModel.php
@@ -12,7 +12,7 @@ use Psr\Log\LoggerInterface;
  *
  * @property int id
  */
-abstract class BaseModel
+abstract class BaseModel extends BaseEntity
 {
        /** @var Database */
        protected $dba;
@@ -53,6 +53,11 @@ abstract class BaseModel
                return $this->originalData;
        }
 
+       public function resetOriginalData()
+       {
+               $this->originalData = $this->data;
+       }
+
        /**
         * Performance-improved model creation in a loop
         *
@@ -69,6 +74,18 @@ abstract class BaseModel
                return $model;
        }
 
+       /**
+        * Magic isset method. Returns true if the field exists, either in the data prperty array or in any of the local properties.
+        * Used by array_column() on an array of objects.
+        *
+        * @param $name
+        * @return bool
+        */
+       public function __isset($name)
+       {
+               return in_array($name, array_merge(array_keys($this->data), array_keys(get_object_vars($this))));
+       }
+
        /**
         * Magic getter. This allows to retrieve model fields with the following syntax:
         * - $model->field (outside of class)
@@ -80,9 +97,7 @@ abstract class BaseModel
         */
        public function __get($name)
        {
-               if (empty($this->data['id'])) {
-                       throw new HTTPException\InternalServerErrorException(static::class . ' record uninitialized');
-               }
+               $this->checkValid();
 
                if (!array_key_exists($name, $this->data)) {
                        throw new HTTPException\InternalServerErrorException('Field ' . $name . ' not found in ' . static::class);
@@ -104,4 +119,11 @@ abstract class BaseModel
        {
                return $this->data;
        }
+
+       protected function checkValid()
+       {
+               if (empty($this->data['id'])) {
+                       throw new HTTPException\InternalServerErrorException(static::class . ' record uninitialized');
+               }
+       }
 }