X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseModel.php;h=dbacdfa702048acc45b0d7b1c8301e9d84c535c1;hb=60d9d7f5e07095c0bd60e6a03350181328637d94;hp=decc627521e50309a69dfe9195a1705ceab92b7d;hpb=4a3544582c570d43f7d274ddbae7ea835176cbd9;p=friendica.git

diff --git a/src/BaseModel.php b/src/BaseModel.php
index decc627521..dbacdfa702 100644
--- a/src/BaseModel.php
+++ b/src/BaseModel.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 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,23 +67,9 @@ abstract class BaseModel
 		$this->originalData = $data;
 	}
 
-	/**
-	 * Maps a data array (original/current) to a known field list of the chosen model
-	 *
-	 * This is useful to filter out additional attributes, which aren't part of the db-table (like readonly cached fields)
-	 *
-	 * @param array $data The data array to map to db-fields
-	 *
-	 * @return array the mapped data array
-	 */
-	protected function mapFields(array $data)
+	public function getOriginalData(): array
 	{
-		return $data;
-	}
-
-	public function getOriginalData()
-	{
-		return $this->mapFields($this->originalData);
+		return $this->originalData;
 	}
 
 	public function resetOriginalData()
@@ -79,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;
@@ -95,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))));
 	}
@@ -105,11 +110,11 @@ abstract class BaseModel
 	 * - $model->field (outside of class)
 	 * - $this->field (inside of class)
 	 *
-	 * @param $name
+	 * @param string $name Name of data to fetch
 	 * @return mixed
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public function __get($name)
+	public function __get(string $name)
 	{
 		$this->checkValid();
 
@@ -121,29 +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;
 	}
 
-	/**
-	 * Returns the values of the current model as an array
-	 *
-	 * @param bool $dbOnly True, if just the db-relevant fields should be returned
-	 *
-	 * @return array The values of the current model
-	 */
-	public function toArray(bool $dbOnly = false)
+	public function toArray(): array
 	{
-		return $dbOnly ? $this->mapFields($this->data) : $this->data;
+		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');
 		}
 	}