fix types in collections, add getter for objectType (database/page)

Author: johguentner

src/Entities/Collections/BlockCollection.php

@@ -11,7 +11,7 @@
 
 class BlockCollection extends EntityCollection
 {
-    protected function collectChildren()
+    protected function collectChildren() : void
     {
         $this->collection = new Collection();
         foreach ($this->rawResults as $blockChild) {

src/Entities/Collections/DatabaseCollection.php

@@ -11,7 +11,7 @@
 
 class DatabaseCollection extends EntityCollection
 {
-    protected function collectChildren()
+    protected function collectChildren() : void
     {
         $this->collection = new Collection();
         foreach ($this->rawResults as $databaseChild) {

src/Entities/Collections/PageCollection.php

@@ -11,7 +11,7 @@
 
 class PageCollection extends EntityCollection
 {
-    protected function collectChildren()
+    protected function collectChildren() : void
     {
         $this->collection = new Collection();
         foreach ($this->rawResults as $pageChild) {

src/Entities/Collections/UserCollection.php

@@ -11,7 +11,7 @@
 
 class UserCollection extends EntityCollection
 {
-    protected function collectChildren()
+    protected function collectChildren() : void
     {
         $this->collection = new Collection();
         foreach ($this->rawResults as $userChild) {

src/Entities/Database.php

@@ -11,6 +11,7 @@
 class Database extends Entity
 {
     protected string $title = "";
+    protected string $objectType = "";
     protected array $rawTitle = [];
     protected array $rawProperties = [];
     protected DateTime $createdTime;
@@ -29,26 +30,40 @@ private function fillFromRaw()
     {
         $this->fillId();
         $this->fillTitle();
+        $this->fillObjectType();
         $this->fillProperties();
         $this->fillCreatedTime();
         $this->fillLastEditedTime();
     }
 
-    private function fillTitle() : void
+    private function fillTitle(): void
     {
         if (Arr::exists($this->responseData, 'title') && is_array($this->responseData['title'])) {
             $this->title = Arr::first($this->responseData['title'], null, ['plain_text' => ''])['plain_text'];
             $this->rawTitle = $this->responseData['title'];
         }
     }
 
-    private function fillProperties() : 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')) {
             $this->rawProperties = $this->responseData['properties'];
         }
     }
 
+    public function getObjectType(): string
+    {
+        return $this->objectType;
+    }
+
+
     public function getTitle(): string
     {
         return $this->title;

src/Entities/Page.php

@@ -12,6 +12,7 @@
 class Page extends Entity
 {
     protected string $title = "";
+    protected string $objectType = "";
     protected array $rawProperties = [];
     protected Collection $propertyCollection;
     protected DateTime $createdTime;
@@ -28,12 +29,20 @@ protected function setResponseData(array $responseData): void
     private function fillFromRaw(): void
     {
         $this->fillId();
+        $this->fillObjectType();
         $this->fillProperties();
-        $this->fillTitle();
+        $this->fillTitle(); //!Warning: call after 'fillProperties', since title is included within properties
         $this->fillCreatedTime();
         $this->fillLastEditedTime();
     }
 
+    private function fillObjectType(): void
+    {
+        if (Arr::exists($this->responseData, 'object')) {
+            $this->type = $this->responseData['object'];
+        }
+    }
+
     private function fillProperties(): void
     {
         if (Arr::exists($this->responseData, 'properties')) {
@@ -45,6 +54,7 @@ private function fillProperties(): void
         }
     }
 
+
     private function fillTitle(): void
     {
         $titleProperty = $this->propertyCollection->filter(function ($property) {
@@ -81,6 +91,11 @@ public function getProperty(string $propertyName): ?Property
         return $property;
     }
 
+    public function getObjectType(): string
+    {
+        return $this->objectType;
+    }
+
     public function getRawProperties(): array
     {
         return $this->rawProperties;