From 81a4b5575becf2a10a60e7a2bd2615492c94b8c8 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 10 Dec 2018 11:35:26 -0100 Subject: [PATCH 1/2] some data are only for internal use. --- lib/Model/ActivityPub/Follow.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/Model/ActivityPub/Follow.php b/lib/Model/ActivityPub/Follow.php index e6e22738..1603ef1f 100644 --- a/lib/Model/ActivityPub/Follow.php +++ b/lib/Model/ActivityPub/Follow.php @@ -128,13 +128,22 @@ class Follow extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( + $result = array_merge( parent::jsonSerialize(), - [ - 'follow_id' => $this->getFollowId(), - 'accepted' => $this->isAccepted() - ] + [] ); + + if ($this->isCompleteDetails()) { + array_merge( + $result, + [ + 'follow_id' => $this->getFollowId(), + 'accepted' => $this->isAccepted() + ] + ); + } + + return $result; } } From 1ec6eb18cd5e84d8b5ff9d44df772161504448a5 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Tue, 18 Dec 2018 15:21:05 -0100 Subject: [PATCH 2/2] cleaning array_merge([]) Signed-off-by: Maxence Lange --- lib/Model/ActivityPub/Activity/Accept.php | 6 +----- lib/Model/ActivityPub/Activity/Create.php | 6 +----- lib/Model/ActivityPub/Activity/Delete.php | 6 +----- lib/Model/ActivityPub/Activity/Reject.php | 6 +----- lib/Model/ActivityPub/Activity/Undo.php | 6 +----- lib/Model/ActivityPub/Follow.php | 5 +---- lib/Model/ActivityPub/Image.php | 6 +----- lib/Model/ActivityPub/Tombstone.php | 6 +----- 8 files changed, 8 insertions(+), 39 deletions(-) diff --git a/lib/Model/ActivityPub/Activity/Accept.php b/lib/Model/ActivityPub/Activity/Accept.php index 9d310c2d..af82c9ec 100644 --- a/lib/Model/ActivityPub/Activity/Accept.php +++ b/lib/Model/ActivityPub/Activity/Accept.php @@ -71,11 +71,7 @@ class Accept extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( - parent::jsonSerialize(), - [ - ] - ); + return parent::jsonSerialize(); } } diff --git a/lib/Model/ActivityPub/Activity/Create.php b/lib/Model/ActivityPub/Activity/Create.php index 79385836..1e52c360 100644 --- a/lib/Model/ActivityPub/Activity/Create.php +++ b/lib/Model/ActivityPub/Activity/Create.php @@ -71,11 +71,7 @@ class Create extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( - parent::jsonSerialize(), - [ - ] - ); + return parent::jsonSerialize(); } } diff --git a/lib/Model/ActivityPub/Activity/Delete.php b/lib/Model/ActivityPub/Activity/Delete.php index 9e23d76e..69c20037 100644 --- a/lib/Model/ActivityPub/Activity/Delete.php +++ b/lib/Model/ActivityPub/Activity/Delete.php @@ -71,11 +71,7 @@ class Delete extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( - parent::jsonSerialize(), - [ - ] - ); + return parent::jsonSerialize(); } } diff --git a/lib/Model/ActivityPub/Activity/Reject.php b/lib/Model/ActivityPub/Activity/Reject.php index 5ceb2808..77accf20 100644 --- a/lib/Model/ActivityPub/Activity/Reject.php +++ b/lib/Model/ActivityPub/Activity/Reject.php @@ -71,11 +71,7 @@ class Reject extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( - parent::jsonSerialize(), - [ - ] - ); + return parent::jsonSerialize(); } } diff --git a/lib/Model/ActivityPub/Activity/Undo.php b/lib/Model/ActivityPub/Activity/Undo.php index ec1cfee4..806969de 100644 --- a/lib/Model/ActivityPub/Activity/Undo.php +++ b/lib/Model/ActivityPub/Activity/Undo.php @@ -70,11 +70,7 @@ class Undo extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( - parent::jsonSerialize(), - [ - ] - ); + return parent::jsonSerialize(); } } diff --git a/lib/Model/ActivityPub/Follow.php b/lib/Model/ActivityPub/Follow.php index 1603ef1f..5167af39 100644 --- a/lib/Model/ActivityPub/Follow.php +++ b/lib/Model/ActivityPub/Follow.php @@ -128,10 +128,7 @@ class Follow extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - $result = array_merge( - parent::jsonSerialize(), - [] - ); + $result = parent::jsonSerialize(); if ($this->isCompleteDetails()) { array_merge( diff --git a/lib/Model/ActivityPub/Image.php b/lib/Model/ActivityPub/Image.php index 5947c4a6..449a4f4d 100644 --- a/lib/Model/ActivityPub/Image.php +++ b/lib/Model/ActivityPub/Image.php @@ -72,11 +72,7 @@ class Image extends Document implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( - parent::jsonSerialize(), - [ - ] - ); + return parent::jsonSerialize(); } } diff --git a/lib/Model/ActivityPub/Tombstone.php b/lib/Model/ActivityPub/Tombstone.php index 8904081f..c2de8dea 100644 --- a/lib/Model/ActivityPub/Tombstone.php +++ b/lib/Model/ActivityPub/Tombstone.php @@ -70,11 +70,7 @@ class Tombstone extends ACore implements JsonSerializable { * @return array */ public function jsonSerialize(): array { - return array_merge( - parent::jsonSerialize(), - [ - ] - ); + return parent::jsonSerialize(); } }