From 32bb0976046ef9fa2296d0aeb39a01b0b916dc1e Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Tue, 28 Feb 2023 11:41:53 -0500 Subject: [PATCH] Correct format/style errors --- src/Module/BaseApi.php | 23 +++++++++++++------ .../Mastodon/Status/FriendicaExtension.php | 18 +++++++++++---- .../Api/Mastodon/TimelineOrderByTypes.php | 1 - 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php index 4c16ab20e2..8b79aff491 100644 --- a/src/Module/BaseApi.php +++ b/src/Module/BaseApi.php @@ -189,32 +189,41 @@ class BaseApi extends BaseModule return $params; } - protected function updateBoundaries(Status $status, array $post_item, string $order) { - ; + /** + * Update the ID/time boundaries for this result set. Used for building Link Headers + * + * @param Status $status + * @param array $post_item + * @param string $order + * @return void + * @throws \Exception + */ + protected function updateBoundaries(Status $status, array $post_item, string $order) + { try { switch ($order) { case TimelineOrderByTypes::CHANGED: - if (!empty($status->friendicaExtension()->changedAt())){ + if (!empty($status->friendicaExtension()->changedAt())) { self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->changedAt(), DateTimeFormat::JSON))); } break; case TimelineOrderByTypes::CREATED: - if (!empty($status->createdAt())){ + if (!empty($status->createdAt())) { self::setBoundaries(new DateTime(DateTimeFormat::utc($status->createdAt(), DateTimeFormat::JSON))); } break; case TimelineOrderByTypes::COMMENTED: - if (!empty($status->friendicaExtension()->commentedAt())){ + if (!empty($status->friendicaExtension()->commentedAt())) { self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->commentedAt(), DateTimeFormat::JSON))); } break; case TimelineOrderByTypes::EDITED: - if (!empty($status->friendicaExtension()->editedAt())){ + if (!empty($status->friendicaExtension()->editedAt())) { self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->editedAt(), DateTimeFormat::JSON))); } break; case TimelineOrderByTypes::RECEIVED: - if (!empty($status->friendicaExtension()->receivedAt())){ + if (!empty($status->friendicaExtension()->receivedAt())) { self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->receivedAt(), DateTimeFormat::JSON))); } break; diff --git a/src/Object/Api/Mastodon/Status/FriendicaExtension.php b/src/Object/Api/Mastodon/Status/FriendicaExtension.php index 3e39c2baa6..b6dcd5df0c 100644 --- a/src/Object/Api/Mastodon/Status/FriendicaExtension.php +++ b/src/Object/Api/Mastodon/Status/FriendicaExtension.php @@ -52,16 +52,27 @@ class FriendicaExtension extends BaseDataTransferObject /** @var int */ protected $dislikes_count; + /** * Creates a status count object * * @param string $title + * @param string|null $changed_at + * @param string|null $commented_at + * @param string|null $edited_at + * @param string|null $received_at * @param int $dislikes_count * @param FriendicaDeliveryData $delivery_data */ - public function __construct(string $title, ?string $changed_at, ?string $commented_at, ?string $edited_at, ?string $received_at, - int $dislikes_count, FriendicaDeliveryData $delivery_data) - { + public function __construct( + string $title, + ?string $changed_at, + ?string $commented_at, + ?string $edited_at, + ?string $received_at, + int $dislikes_count, + FriendicaDeliveryData $delivery_data + ) { $this->title = $title; $this->changed_at = $changed_at; $this->commented_at = $commented_at; @@ -106,5 +117,4 @@ class FriendicaExtension extends BaseDataTransferObject { return $this->received_at; } - } diff --git a/src/Object/Api/Mastodon/TimelineOrderByTypes.php b/src/Object/Api/Mastodon/TimelineOrderByTypes.php index 04fb7cc3b8..d50f389bf0 100644 --- a/src/Object/Api/Mastodon/TimelineOrderByTypes.php +++ b/src/Object/Api/Mastodon/TimelineOrderByTypes.php @@ -38,5 +38,4 @@ abstract class TimelineOrderByTypes const ID = 'id'; const RECEIVED = 'received'; - }