Skip to content

Commit 661beeb

Browse files
committed
Merge branch 'feature/add-database-attributes' into feature/comments
2 parents 769168a + 78d93e2 commit 661beeb

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

src/Entities/Blocks/Block.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ protected function fillFromRaw(): void
6363
$this->fillType();
6464
$this->fillRawContent();
6565
$this->fillHasChildren();
66-
$this->fillParentProperties();
67-
$this->fillArchivedProperties();
68-
$this->fillTimestampableProperties();
66+
$this->fillParentAttributes();
67+
$this->fillArchivedAttributes();
68+
$this->fillTimestampableAttributes();
6969
}
7070

7171
private function fillType(): void

src/Entities/Database.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ private function fillFromRaw()
107107
$this->fillDescription();
108108
$this->fillProperties();
109109
$this->fillDatabaseUrl();
110-
$this->fillParentProperties();
111-
$this->fillArchivedProperties();
112-
$this->fillTimestampableProperties();
110+
$this->fillParentAttributes();
111+
$this->fillArchivedAttributes();
112+
$this->fillTimestampableAttributes();
113113
}
114114

115115
private function fillTitle(): void

src/Entities/Page.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ private function fillFromRaw(): void
117117
$this->fillPageUrl();
118118
$this->fillIcon();
119119
$this->fillCover();
120-
$this->fillParentProperties();
121-
$this->fillArchivedProperties();
122-
$this->fillTimestampableProperties();
120+
$this->fillParentAttributes();
121+
$this->fillArchivedAttributes();
122+
$this->fillTimestampableAttributes();
123123
}
124124

125125
/**

src/Traits/HasArchive.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait HasArchive
1919
*/
2020
private bool $archived = false;
2121

22-
protected function fillArchivedProperties(): void
22+
protected function fillArchivedAttributes(): void
2323
{
2424
$this->fillArchived();
2525
}

src/Traits/HasParent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trait HasParent
2424
*/
2525
private string $parentType = '';
2626

27-
protected function fillParentProperties(): void
27+
protected function fillParentAttributes(): void
2828
{
2929
$this->fillParent();
3030
}

src/Traits/HasTimestamps.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,36 +37,36 @@ trait HasTimestamps
3737
*/
3838
protected User $lastEditedBy;
3939

40-
protected function fillTimestampableProperties(): void
40+
protected function fillTimestampableAttributes(): void
4141
{
4242
$this->fillCreatedTime();
4343
$this->fillLastEditedTime();
4444
$this->fillCreatedBy();
4545
$this->fillLastEditedBy();
4646
}
4747

48-
protected function fillCreatedTime(): void
48+
private function fillCreatedTime(): void
4949
{
5050
if (Arr::exists($this->responseData, 'created_time')) {
5151
$this->createdTime = new Carbon($this->responseData['created_time']);
5252
}
5353
}
5454

55-
protected function fillLastEditedTime(): void
55+
private function fillLastEditedTime(): void
5656
{
5757
if (Arr::exists($this->responseData, 'last_edited_time')) {
5858
$this->lastEditedTime = new Carbon($this->responseData['last_edited_time']);
5959
}
6060
}
6161

62-
protected function fillCreatedBy(): void
62+
private function fillCreatedBy(): void
6363
{
6464
if (Arr::exists($this->responseData, 'created_by')) {
6565
$this->createdBy = new User($this->responseData['created_by']);
6666
}
6767
}
6868

69-
protected function fillLastEditedBy(): void
69+
private function fillLastEditedBy(): void
7070
{
7171
if (Arr::exists($this->responseData, 'last_edited_by')) {
7272
$this->lastEditedBy = new User($this->responseData['last_edited_by']);

0 commit comments

Comments
 (0)