Merge branch 'feature/create-timestampable-trait' into feature/add-database-attributes

johguentner · johguentner · commit cef1226f1874 · 2023-02-06T09:20:37.000+01:00
diff --git a/src/Entities/Blocks/Block.php b/src/Entities/Blocks/Block.php
@@ -65,7 +65,7 @@ protected function fillFromRaw(): void
         $this->fillHasChildren();
         $this->fillParentProperties();
         $this->fillArchivedProperties();
-        $this->fillTimestampableProperties();
+        $this->fillTimestampableAttributes();
     }
 
     private function fillType(): void
diff --git a/src/Entities/Database.php b/src/Entities/Database.php
@@ -109,7 +109,7 @@ private function fillFromRaw()
         $this->fillDatabaseUrl();
         $this->fillParentProperties();
         $this->fillArchivedProperties();
-        $this->fillTimestampableProperties();
+        $this->fillTimestampableAttributes();
     }
 
     private function fillTitle(): void
diff --git a/src/Entities/Page.php b/src/Entities/Page.php
@@ -119,7 +119,7 @@ private function fillFromRaw(): void
         $this->fillCover();
         $this->fillParentProperties();
         $this->fillArchivedProperties();
-        $this->fillTimestampableProperties();
+        $this->fillTimestampableAttributes();
     }
 
     /**
diff --git a/src/Traits/HasTimestamps.php b/src/Traits/HasTimestamps.php
@@ -37,36 +37,36 @@ trait HasTimestamps
      */
     protected User $lastEditedBy;
 
-    protected function fillTimestampableProperties(): void
+    protected function fillTimestampableAttributes(): void
     {
         $this->fillCreatedTime();
         $this->fillLastEditedTime();
         $this->fillCreatedBy();
         $this->fillLastEditedBy();
     }
 
-    protected function fillCreatedTime(): void
+    private function fillCreatedTime(): void
     {
         if (Arr::exists($this->responseData, 'created_time')) {
             $this->createdTime = new Carbon($this->responseData['created_time']);
         }
     }
 
-    protected function fillLastEditedTime(): void
+    private function fillLastEditedTime(): void
     {
         if (Arr::exists($this->responseData, 'last_edited_time')) {
             $this->lastEditedTime = new Carbon($this->responseData['last_edited_time']);
         }
     }
 
-    protected function fillCreatedBy(): void
+    private function fillCreatedBy(): void
     {
         if (Arr::exists($this->responseData, 'created_by')) {
             $this->createdBy = new User($this->responseData['created_by']);
         }
     }
 
-    protected function fillLastEditedBy(): void
+    private function fillLastEditedBy(): void
     {
         if (Arr::exists($this->responseData, 'last_edited_by')) {
             $this->lastEditedBy = new User($this->responseData['last_edited_by']);

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function fillFromRaw(): void`
`65`	`65`	`$this->fillHasChildren();`
`66`	`66`	`$this->fillParentProperties();`
`67`	`67`	`$this->fillArchivedProperties();`
`68`		`- $this->fillTimestampableProperties();`
	`68`	`+ $this->fillTimestampableAttributes();`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`private function fillType(): void`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private function fillFromRaw()`
`109`	`109`	`$this->fillDatabaseUrl();`
`110`	`110`	`$this->fillParentProperties();`
`111`	`111`	`$this->fillArchivedProperties();`
`112`		`- $this->fillTimestampableProperties();`
	`112`	`+ $this->fillTimestampableAttributes();`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`private function fillTitle(): void`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private function fillFromRaw(): void`
`119`	`119`	`$this->fillCover();`
`120`	`120`	`$this->fillParentProperties();`
`121`	`121`	`$this->fillArchivedProperties();`
`122`		`- $this->fillTimestampableProperties();`
	`122`	`+ $this->fillTimestampableAttributes();`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,36 +37,36 @@ trait HasTimestamps`
`37`	`37`	`*/`
`38`	`38`	`protected User $lastEditedBy;`
`39`	`39`
`40`		`- protected function fillTimestampableProperties(): void`
	`40`	`+ protected function fillTimestampableAttributes(): void`
`41`	`41`	`{`
`42`	`42`	`$this->fillCreatedTime();`
`43`	`43`	`$this->fillLastEditedTime();`
`44`	`44`	`$this->fillCreatedBy();`
`45`	`45`	`$this->fillLastEditedBy();`
`46`	`46`	`}`
`47`	`47`
`48`		`- protected function fillCreatedTime(): void`
	`48`	`+ private function fillCreatedTime(): void`
`49`	`49`	`{`
`50`	`50`	`if (Arr::exists($this->responseData, 'created_time')) {`
`51`	`51`	`$this->createdTime = new Carbon($this->responseData['created_time']);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- protected function fillLastEditedTime(): void`
	`55`	`+ private function fillLastEditedTime(): void`
`56`	`56`	`{`
`57`	`57`	`if (Arr::exists($this->responseData, 'last_edited_time')) {`
`58`	`58`	`$this->lastEditedTime = new Carbon($this->responseData['last_edited_time']);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- protected function fillCreatedBy(): void`
	`62`	`+ private function fillCreatedBy(): void`
`63`	`63`	`{`
`64`	`64`	`if (Arr::exists($this->responseData, 'created_by')) {`
`65`	`65`	`$this->createdBy = new User($this->responseData['created_by']);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- protected function fillLastEditedBy(): void`
	`69`	`+ private function fillLastEditedBy(): void`
`70`	`70`	`{`
`71`	`71`	`if (Arr::exists($this->responseData, 'last_edited_by')) {`
`72`	`72`	`$this->lastEditedBy = new User($this->responseData['last_edited_by']);`