move object to entity base class

- and do filling of ``id`` and ``object`` within a entity base class method
- call ``::fillEntityBase`` form the ``fillFromRaw`` within all according entitites
- add test-cases for checking ``getObjectType``

Author: johguentner

src/Entities/Blocks/Block.php

@@ -59,7 +59,7 @@ protected function setResponseData(array $responseData): void
 
     protected function fillFromRaw(): void
     {
-        $this->fillId();
+        parent::fillEntityBase();
         $this->fillType();
         $this->fillRawContent();
         $this->fillHasChildren();

src/Entities/Database.php

@@ -53,11 +53,6 @@ class Database extends Entity
      */
     private string $url;
 
-    /**
-     * @var string
-     */
-    protected string $objectType = '';
-
     /**
      * @var ?RichText
      */
@@ -104,13 +99,12 @@ protected function setResponseData(array $responseData): void
 
     private function fillFromRaw()
     {
-        $this->fillId();
+        parent::fillEntityBase();
         $this->fillIcon();
         $this->fillCover();
         $this->fillTitle();
         $this->fillIsInline();
         $this->fillDescription();
-        $this->fillObjectType();
         $this->fillProperties();
         $this->fillDatabaseUrl();
         $this->fillParentProperties();
@@ -174,13 +168,6 @@ private function fillCover(): void
         }
     }
 
-    private function fillObjectType(): void
-    {
-        if (Arr::exists($this->responseData, 'object')) {
-            $this->objectType = $this->responseData['object'];
-        }
-    }
-
     private function fillProperties(): void
     {
         if (Arr::exists($this->responseData, 'properties')) {
@@ -209,14 +196,6 @@ public function getProperty(string $propertyKey): ?Property
         return $this->propertyMap[$propertyKey];
     }
 
-    /**
-     * @return string
-     */
-    public function getObjectType(): string
-    {
-        return $this->objectType;
-    }
-
     /**
      * @return string
      */

src/Entities/Entity.php

@@ -17,6 +17,11 @@ class Entity implements JsonSerializable
      */
     private string $id;
 
+    /**
+     * @var string
+     */
+    protected string $objectType = '';
+
     /**
      * @var array
      */
@@ -67,11 +72,24 @@ protected function setResponseData(array $responseData): void
         $this->responseData = $responseData;
     }
 
-    protected function fillId()
+    protected function fillEntityBase(): void
+    {
+        $this->fillId();
+        $this->fillObjectType();
+    }
+
+    private function fillId()
     {
         $this->id = $this->responseData['id'];
     }
 
+    private function fillObjectType(): void
+    {
+        if (Arr::exists($this->responseData, 'object')) {
+            $this->objectType = $this->responseData['object'];
+        }
+    }
+
     /**
      * @return string
      */
@@ -80,11 +98,20 @@ public function getId(): string
         return $this->id;
     }
 
+    
     public function setId($id): void
     {
         $this->id = $id;
     }
 
+    /**
+     * @return string
+     */
+    public function getObjectType(): string
+    {
+        return $this->objectType;
+    }
+
     /**
      * @return array
      */

src/Entities/Page.php

@@ -60,11 +60,6 @@ class Page extends Entity
      */
     private string $coverType = '';
 
-    /**
-     * @var string
-     */
-    protected string $objectType = '';
-
     /**
      * @var array
      */
@@ -116,8 +111,7 @@ protected function setResponseData(array $responseData): void
 
     private function fillFromRaw(): void
     {
-        $this->fillId();
-        $this->fillObjectType();
+        parent::fillEntityBase();
         $this->fillProperties();
         $this->fillTitle(); // This has to be called after fillProperties(), since title is provided by properties
         $this->fillPageUrl();
@@ -128,13 +122,6 @@ private function fillFromRaw(): void
         $this->fillTimestampableProperties();
     }
 
-    private function fillObjectType(): void
-    {
-        if (Arr::exists($this->responseData, 'object')) {
-            $this->objectType = $this->responseData['object'];
-        }
-    }
-
     /**
      * @throws HandlingException
      */
@@ -446,14 +433,6 @@ public function getProperty(string $propertyKey): ?Property
         return $this->propertyMap[$propertyKey];
     }
 
-    /**
-     * @return string
-     */
-    public function getObjectType(): string
-    {
-        return $this->objectType;
-    }
-
     /**
      * @return array
      */

src/Entities/Properties/Property.php

@@ -62,7 +62,7 @@ protected function setResponseData(array $responseData): void
 
     protected function fillFromRaw(): void
     {
-        $this->fillId();
+        parent::fillEntityBase();
         $this->fillType();
         $this->fillContent();
     }

src/Entities/PropertyItems/SelectItem.php

@@ -36,7 +36,7 @@ protected function setResponseData(array $responseData): void
 
     protected function fillFromRaw(): void
     {
-        $this->fillId();
+        parent::fillEntityBase();
         $this->fillName();
         $this->fillColor();
     }

src/Entities/User.php

@@ -37,7 +37,7 @@ protected function setResponseData(array $responseData): void
 
     private function fillFromRaw(): void
     {
-        $this->fillId();
+        parent::fillEntityBase();
         $this->fillName();
         $this->fillAvatarUrl();
     }