From 8b15bb9e664b49788da72f7d55b1d7a4b429adb9 Mon Sep 17 00:00:00 2001 From: Art4 Date: Fri, 6 Dec 2024 21:55:04 +0000 Subject: [PATCH] Fix errors in Object namespace --- src/Object/Api/Mastodon/Activity.php | 1 - src/Object/Api/Mastodon/Application.php | 1 - src/Object/Api/Mastodon/Emoji.php | 1 - src/Object/Api/Mastodon/Error.php | 3 --- src/Object/Api/Mastodon/ListEntity.php | 2 -- src/Object/Api/Mastodon/Preferences.php | 4 ---- src/Object/Api/Mastodon/Status/Counts.php | 3 +++ src/Object/Api/Mastodon/Status/UserAttributes.php | 6 ++++++ src/Object/Api/Mastodon/Tag.php | 2 +- src/Object/Api/Twitter/Attachment.php | 1 - src/Object/Api/Twitter/Hashtag.php | 1 - src/Object/Api/Twitter/Media.php | 1 - src/Object/Api/Twitter/Mention.php | 1 - src/Object/Api/Twitter/SavedSearch.php | 1 - src/Object/Api/Twitter/Url.php | 1 - src/Object/Image.php | 7 +++---- src/Object/Log/ParsedLogLine.php | 2 +- 17 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/Object/Api/Mastodon/Activity.php b/src/Object/Api/Mastodon/Activity.php index cab2b30068..5617bc7e7f 100644 --- a/src/Object/Api/Mastodon/Activity.php +++ b/src/Object/Api/Mastodon/Activity.php @@ -28,7 +28,6 @@ class Activity extends BaseDataTransferObject /** * Creates an activity * - * @param array $item * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(int $week, int $statuses, int $logins, int $registrations) diff --git a/src/Object/Api/Mastodon/Application.php b/src/Object/Api/Mastodon/Application.php index 789b445d0c..50837f90cb 100644 --- a/src/Object/Api/Mastodon/Application.php +++ b/src/Object/Api/Mastodon/Application.php @@ -34,7 +34,6 @@ class Application extends BaseDataTransferObject /** * Creates an application entry * - * @param array $item * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(string $name, string $client_id = null, string $client_secret = null, int $id = null, string $redirect_uri = null, string $website = null, string $vapid_key = null) diff --git a/src/Object/Api/Mastodon/Emoji.php b/src/Object/Api/Mastodon/Emoji.php index 8edbccc36f..a91f158e72 100644 --- a/src/Object/Api/Mastodon/Emoji.php +++ b/src/Object/Api/Mastodon/Emoji.php @@ -32,7 +32,6 @@ class Emoji extends BaseDataTransferObject // Optional attributes /** * Unsupported - * @var string */ //protected $category; diff --git a/src/Object/Api/Mastodon/Error.php b/src/Object/Api/Mastodon/Error.php index 220f00e8be..945ebfc592 100644 --- a/src/Object/Api/Mastodon/Error.php +++ b/src/Object/Api/Mastodon/Error.php @@ -23,9 +23,6 @@ class Error extends BaseDataTransferObject /** * Creates an error record - * - * @param string $error - * @param string error_description */ public function __construct(string $error, string $error_description) { diff --git a/src/Object/Api/Mastodon/ListEntity.php b/src/Object/Api/Mastodon/ListEntity.php index ab3b6363ad..0bd613d0f9 100644 --- a/src/Object/Api/Mastodon/ListEntity.php +++ b/src/Object/Api/Mastodon/ListEntity.php @@ -26,8 +26,6 @@ class ListEntity extends BaseDataTransferObject /** * Creates an list record * - * @param int $id - * @param string $title * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(string $id, string $title, string $policy) diff --git a/src/Object/Api/Mastodon/Preferences.php b/src/Object/Api/Mastodon/Preferences.php index 68f3c922a8..fcae499d92 100644 --- a/src/Object/Api/Mastodon/Preferences.php +++ b/src/Object/Api/Mastodon/Preferences.php @@ -45,10 +45,6 @@ class Preferences extends BaseDataTransferObject /** * Creates a preferences record. * - * @param BaseURL $baseUrl - * @param array $publicContact Full contact table record with uid = 0 - * @param array $apcontact Optional full apcontact table record - * @param array $userContact Optional full contact table record with uid != 0 * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(string $visibility, bool $sensitive, string $language, string $media, bool $spoilers) diff --git a/src/Object/Api/Mastodon/Status/Counts.php b/src/Object/Api/Mastodon/Status/Counts.php index f273b342e7..a28508d2ea 100644 --- a/src/Object/Api/Mastodon/Status/Counts.php +++ b/src/Object/Api/Mastodon/Status/Counts.php @@ -12,6 +12,9 @@ namespace Friendica\Object\Api\Mastodon\Status; * * @see https://docs.joinmastodon.org/entities/status * + * @property-read int $replies + * @property-read int $reblogs + * @property-read int $favourites * @property-read int $dislikes */ class Counts diff --git a/src/Object/Api/Mastodon/Status/UserAttributes.php b/src/Object/Api/Mastodon/Status/UserAttributes.php index e30961303d..0e7ae09e9d 100644 --- a/src/Object/Api/Mastodon/Status/UserAttributes.php +++ b/src/Object/Api/Mastodon/Status/UserAttributes.php @@ -10,6 +10,12 @@ namespace Friendica\Object\Api\Mastodon\Status; /** * Class UserAttributes * + * @property-read bool $favourited + * @property-read bool $reblogged + * @property-read bool $muted + * @property-read bool $bookmarked + * @property-read bool $pinned + * * @see https://docs.joinmastodon.org/entities/status */ class UserAttributes diff --git a/src/Object/Api/Mastodon/Tag.php b/src/Object/Api/Mastodon/Tag.php index 12851a9131..3c14a5e616 100644 --- a/src/Object/Api/Mastodon/Tag.php +++ b/src/Object/Api/Mastodon/Tag.php @@ -32,7 +32,7 @@ class Tag extends BaseDataTransferObject * @param BaseURL $baseUrl * @param array $tag tag-view record * @param array $history - * @param array $following "true" if the user is following this tag + * @param bool $following "true" if the user is following this tag * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(BaseURL $baseUrl, array $tag, array $history = [], bool $following = false) diff --git a/src/Object/Api/Twitter/Attachment.php b/src/Object/Api/Twitter/Attachment.php index 3e5af7d3cf..8c5bcea305 100644 --- a/src/Object/Api/Twitter/Attachment.php +++ b/src/Object/Api/Twitter/Attachment.php @@ -26,7 +26,6 @@ class Attachment extends BaseDataTransferObject /** * Creates an Attachment entity array * - * @param array $attachment * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(array $media) diff --git a/src/Object/Api/Twitter/Hashtag.php b/src/Object/Api/Twitter/Hashtag.php index 9c8d688025..de8ed71cf6 100644 --- a/src/Object/Api/Twitter/Hashtag.php +++ b/src/Object/Api/Twitter/Hashtag.php @@ -24,7 +24,6 @@ class Hashtag extends BaseDataTransferObject /** * Creates a hashtag * - * @param array $attachment * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(string $name, array $indices) diff --git a/src/Object/Api/Twitter/Media.php b/src/Object/Api/Twitter/Media.php index 3650613c0e..19f98f1a29 100644 --- a/src/Object/Api/Twitter/Media.php +++ b/src/Object/Api/Twitter/Media.php @@ -41,7 +41,6 @@ class Media extends BaseDataTransferObject /** * Creates a media entity array * - * @param array $attachment * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(array $media, string $url, array $indices) diff --git a/src/Object/Api/Twitter/Mention.php b/src/Object/Api/Twitter/Mention.php index 113f682b51..e5d257e9d3 100644 --- a/src/Object/Api/Twitter/Mention.php +++ b/src/Object/Api/Twitter/Mention.php @@ -31,7 +31,6 @@ class Mention extends BaseDataTransferObject /** * Creates a mention record from an tag-view record. * - * @param BaseURL $baseUrl * @param array $tag tag-view record * @param array $contact contact table record * @throws \Friendica\Network\HTTPException\InternalServerErrorException diff --git a/src/Object/Api/Twitter/SavedSearch.php b/src/Object/Api/Twitter/SavedSearch.php index fafb1acec9..28f62f83f4 100644 --- a/src/Object/Api/Twitter/SavedSearch.php +++ b/src/Object/Api/Twitter/SavedSearch.php @@ -34,7 +34,6 @@ class SavedSearch extends BaseDataTransferObject /** * Creates a saved search record from a search record. * - * @param BaseURL $baseUrl * @param array $search Full search table record */ public function __construct(array $search) diff --git a/src/Object/Api/Twitter/Url.php b/src/Object/Api/Twitter/Url.php index f16bec6341..92c2727155 100644 --- a/src/Object/Api/Twitter/Url.php +++ b/src/Object/Api/Twitter/Url.php @@ -28,7 +28,6 @@ class Url extends BaseDataTransferObject /** * Creates an URL entity array * - * @param array $attachment * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __construct(array $media, array $indices) diff --git a/src/Object/Image.php b/src/Object/Image.php index 8a06b37fbd..43b6d91607 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -13,7 +13,7 @@ use Friendica\Util\Images; use Imagick; use ImagickDraw; use ImagickPixel; -use GDImage; +use GdImage; use kornrunner\Blurhash\Blurhash; /** @@ -21,7 +21,7 @@ use kornrunner\Blurhash\Blurhash; */ class Image { - /** @var GDImage|Imagick|resource */ + /** @var GdImage|Imagick|resource */ private $image; /* @@ -41,7 +41,7 @@ class Image * @param string $data Image data * @param string $type optional, default '' * @param string $filename optional, default '' - * @param string $imagick optional, default 'true' + * @param bool $imagick optional, default 'true' * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ @@ -765,7 +765,6 @@ class Image /** * Create a blurhash out of a given image string * - * @param string $img_str * @return string */ public function getBlurHash(): string diff --git a/src/Object/Log/ParsedLogLine.php b/src/Object/Log/ParsedLogLine.php index 0a861c617e..1d9802bb32 100644 --- a/src/Object/Log/ParsedLogLine.php +++ b/src/Object/Log/ParsedLogLine.php @@ -39,7 +39,7 @@ class ParsedLogLine public $logline; /** - * @param int line id + * @param int $id line id * @param string $logline Source log line to parse */ public function __construct(int $id, string $logline)