Fix 4 PHPStan errors

diff --git a/src/Navigation/Notifications/Repository/Notification.php b/src/Navigation/Notifications/Repository/Notification.php
index 11d3bd6b5474050b4ac3149cee2a525cff995cf3..e0e1d2aa983aab6f77171fd255a3540fb8fc66b7 100644 (file)
--- a/src/Navigation/Notifications/Repository/Notification.php
+++ b/src/Navigation/Notifications/Repository/Notification.php
@@ -15,8 +15,8 @@ use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Model\Post\UserNotification;
 use Friendica\Model\Verb;
-use Friendica\Navigation\Notifications\Collection;
-use Friendica\Navigation\Notifications\Entity;
+use Friendica\Navigation\Notifications\Collection\Notifications as NotificationsCollection;
+use Friendica\Navigation\Notifications\Entity\Notification as NotificationEntity;
 use Friendica\Navigation\Notifications\Factory;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Protocol\Activity;
@@ -41,19 +41,18 @@ class Notification extends BaseRepository
        }
 
        /**
-        * @param array $condition
-        * @param array $params
-        * @return Entity\Notification
         * @throws NotFoundException
         */
-       private function selectOne(array $condition, array $params = []): Entity\Notification
+       private function selectOne(array $condition, array $params = []): NotificationEntity
        {
-               return parent::_selectOne($condition, $params);
+               $fields = $this->_selectFirstRowAsArray( $condition, $params);
+
+               return $this->factory->createFromTableRow($fields);
        }
 
-       private function select(array $condition, array $params = []): Collection\Notifications
+       private function select(array $condition, array $params = []): NotificationsCollection
        {
-               return new Collection\Notifications(parent::_select($condition, $params)->getArrayCopy());
+               return new NotificationsCollection(parent::_select($condition, $params)->getArrayCopy());
        }
 
        public function countForUser($uid, array $condition, array $params = []): int
@@ -71,23 +70,21 @@ class Notification extends BaseRepository
        }
 
        /**
-        * @param int $id
-        * @return Entity\Notification
         * @throws NotFoundException
         */
-       public function selectOneById(int $id): Entity\Notification
+       public function selectOneById(int $id): NotificationEntity
        {
                return $this->selectOne(['id' => $id]);
        }
 
-       public function selectOneForUser(int $uid, array $condition, array $params = []): Entity\Notification
+       public function selectOneForUser(int $uid, array $condition, array $params = []): NotificationEntity
        {
                $condition = DBA::mergeConditions($condition, ['uid' => $uid]);
 
                return $this->selectOne($condition, $params);
        }
 
-       public function selectForUser(int $uid, array $condition = [], array $params = []): Collection\Notifications
+       public function selectForUser(int $uid, array $condition = [], array $params = []): NotificationsCollection
        {
                $condition = DBA::mergeConditions($condition, ['uid' => $uid]);
 
@@ -98,12 +95,9 @@ class Notification extends BaseRepository
        /**
         * Returns only the most recent notifications for the same conversation or contact
         *
-        * @param int $uid
-        *
-        * @return Collection\Notifications
         * @throws Exception
         */
-       public function selectDetailedForUser(int $uid): Collection\Notifications
+       public function selectDetailedForUser(int $uid): NotificationsCollection
        {
                $notify_type = $this->pconfig->get($uid, 'system', 'notify_type');
                if (!is_null($notify_type)) {
@@ -113,11 +107,11 @@ class Notification extends BaseRepository
                }
 
                if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
-                       $condition = DBA::mergeConditions($condition, ['NOT `vid` IN (?, ?)', Verb::getID(\Friendica\Protocol\Activity::LIKE), Verb::getID(\Friendica\Protocol\Activity::DISLIKE)]);
+                       $condition = DBA::mergeConditions($condition, ['NOT `vid` IN (?, ?)', Verb::getID(Activity::LIKE), Verb::getID(Activity::DISLIKE)]);
                }
 
                if (!$this->pconfig->get($uid, 'system', 'notify_announce')) {
-                       $condition = DBA::mergeConditions($condition, ['`vid` != ?', Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE)]);
+                       $condition = DBA::mergeConditions($condition, ['`vid` != ?', Verb::getID(Activity::ANNOUNCE)]);
                }
 
                return $this->selectForUser($uid, $condition, ['limit' => 50, 'order' => ['id' => true]]);
@@ -126,12 +120,9 @@ class Notification extends BaseRepository
        /**
         * Returns only the most recent notifications for the same conversation or contact
         *
-        * @param int $uid
-        *
-        * @return Collection\Notifications
         * @throws Exception
         */
-       public function selectDigestForUser(int $uid): Collection\Notifications
+       public function selectDigestForUser(int $uid): NotificationsCollection
        {
                $values = [$uid];
 
@@ -145,14 +136,14 @@ class Notification extends BaseRepository
                $like_condition = '';
                if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
                        $like_condition = 'AND NOT `vid` IN (?, ?)';
-                       $values[] = Verb::getID(\Friendica\Protocol\Activity::LIKE);
-                       $values[] = Verb::getID(\Friendica\Protocol\Activity::DISLIKE);
+                       $values[] = Verb::getID(Activity::LIKE);
+                       $values[] = Verb::getID(Activity::DISLIKE);
                }
 
                $announce_condition = '';
                if (!$this->pconfig->get($uid, 'system', 'notify_announce')) {
                        $announce_condition = 'AND vid != ?';
-                       $values[] = Verb::getID(\Friendica\Protocol\Activity::ANNOUNCE);
+                       $values[] = Verb::getID(Activity::ANNOUNCE);
                }
 
                $rows = $this->db->p("
@@ -171,7 +162,7 @@ class Notification extends BaseRepository
                LIMIT 50
                ", ...$values);
 
-               $Entities = new Collection\Notifications();
+               $Entities = new NotificationsCollection();
                foreach ($rows as $fields) {
                        $Entities[] = $this->factory->createFromTableRow($fields);
                }
@@ -179,7 +170,7 @@ class Notification extends BaseRepository
                return $Entities;
        }
 
-       public function selectAllForUser(int $uid): Collection\Notifications
+       public function selectAllForUser(int $uid): NotificationsCollection
        {
                return $this->selectForUser($uid);
        }
@@ -199,7 +190,7 @@ class Notification extends BaseRepository
        {
                $BaseCollection = parent::_selectByBoundaries($condition, $params, $min_id, $max_id, $limit);
 
-               return new Collection\Notifications($BaseCollection->getArrayCopy(), $BaseCollection->getTotalCount());
+               return new NotificationsCollection($BaseCollection->getArrayCopy(), $BaseCollection->getTotalCount());
        }
 
        public function setAllSeenForUser(int $uid, array $condition = []): bool
@@ -217,11 +208,9 @@ class Notification extends BaseRepository
        }
 
        /**
-        * @param Entity\Notification $Notification
-        * @return Entity\Notification
         * @throws Exception
         */
-       public function save(Entity\Notification $Notification): Entity\Notification
+       public function save(NotificationEntity $Notification): NotificationEntity
        {
                $fields = [
                        'uid'           => $Notification->uid,

diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
index 1c793faaee1af21b9760fa404fd1af6c081da490..8c8cde13332fed5b0f591d323352c4880ba9d902 100644 (file)
--- a/src/Navigation/Notifications/Repository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -20,7 +20,8 @@ use Friendica\Database\DBA;
 use Friendica\Factory\Api\Mastodon\Notification as NotificationFactory;
 use Friendica\Model;
 use Friendica\Navigation\Notifications\Collection;
-use Friendica\Navigation\Notifications\Entity;
+use Friendica\Navigation\Notifications\Entity\Notification as NotificationEntity;
+use Friendica\Navigation\Notifications\Entity\Notify as NotifyEntity;
 use Friendica\Navigation\Notifications\Exception;
 use Friendica\Navigation\Notifications\Factory;
 use Friendica\Network\HTTPException;
@@ -31,7 +32,7 @@ use Friendica\Util\Emailer;
 use Psr\Log\LoggerInterface;
 
 /**
- * @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Repository\Notification instead
+ * @deprecated 2022.05 Use `\Friendica\Navigation\Notifications\Repository\Notification` instead
  */
 class Notify extends BaseRepository
 {
@@ -71,15 +72,13 @@ class Notify extends BaseRepository
        }
 
        /**
-        * @param array $condition
-        * @param array $params
-        *
-        * @return Entity\Notify
         * @throws HTTPException\NotFoundException
         */
-       private function selectOne(array $condition, array $params = []): Entity\Notify
+       private function selectOne(array $condition, array $params = []): NotifyEntity
        {
-               return parent::_selectOne($condition, $params);
+               $fields = $this->_selectFirstRowAsArray( $condition, $params);
+
+               return $this->factory->createFromTableRow($fields);
        }
 
        private function select(array $condition, array $params = []): Collection\Notifies
@@ -104,10 +103,9 @@ class Notify extends BaseRepository
        /**
         * @param int $id
         *
-        * @return Entity\Notify
         * @throws HTTPException\NotFoundException
         */
-       public function selectOneById(int $id): Entity\Notify
+       public function selectOneById(int $id): NotifyEntity
        {
                return $this->selectOne(['id' => $id]);
        }
@@ -139,14 +137,11 @@ class Notify extends BaseRepository
        }
 
        /**
-        * @param Entity\Notify $Notify
-        *
-        * @return Entity\Notify
         * @throws HTTPException\NotFoundException
         * @throws HTTPException\InternalServerErrorException
         * @throws Exception\NotificationCreationInterceptedException
         */
-       public function save(Entity\Notify $Notify): Entity\Notify
+       public function save(NotifyEntity $Notify): NotifyEntity
        {
                $fields = [
                        'type'          => $Notify->type,
@@ -181,7 +176,7 @@ class Notify extends BaseRepository
                return $Notify;
        }
 
-       public function setAllSeenForRelatedNotify(Entity\Notify $Notify): bool
+       public function setAllSeenForRelatedNotify(NotifyEntity $Notify): bool
        {
                $condition = [
                        '(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
@@ -670,7 +665,7 @@ class Notify extends BaseRepository
                return false;
        }
 
-       public function shouldShowOnDesktop(Entity\Notification $Notification, string $type = null): bool
+       public function shouldShowOnDesktop(NotificationEntity $Notification, string $type = null): bool
        {
                if (is_null($type)) {
                        $type = NotificationFactory::getType($Notification);
@@ -702,7 +697,7 @@ class Notify extends BaseRepository
                return false;
        }
 
-       public function createFromNotification(Entity\Notification $Notification): bool
+       public function createFromNotification(NotificationEntity $Notification): bool
        {
                $this->logger->info('Start', ['uid' => $Notification->uid, 'id' => $Notification->id, 'type' => $Notification->type]);
 

diff --git a/src/Navigation/Notifications/ValueObject/Introduction.php b/src/Navigation/Notifications/ValueObject/Introduction.php
index 587daa8f4e881619e2f96802c2c42c4427436576..6e2c24d340401a2db2a10926724e33999358d56f 100644 (file)
--- a/src/Navigation/Notifications/ValueObject/Introduction.php
+++ b/src/Navigation/Notifications/ValueObject/Introduction.php
@@ -61,6 +61,34 @@ class Introduction implements \JsonSerializable
        /** @var string */
        private $about;
 
+       public function __construct(array $data = [])
+       {
+               $this->label         = $data['label'] ?? '';
+               $this->type          = $data['str_type'] ?? '';
+               $this->intro_id      = $data['intro_id'] ?? -1;
+               $this->madeBy        = $data['madeBy'] ?? '';
+               $this->madeByUrl     = $data['madeByUrl'] ?? '';
+               $this->madeByZrl     = $data['madeByZrl'] ?? '';
+               $this->madeByAddr    = $data['madeByAddr'] ?? '';
+               $this->contactId     = $data['contactId'] ?? -1;
+               $this->photo         = $data['photo'] ?? '';
+               $this->name          = $data['name'] ?? '';
+               $this->url           = $data['url'] ?? '';
+               $this->zrl           = $data['zrl'] ?? '';
+               $this->hidden        = $data['hidden'] ?? false;
+               $this->postNewFriend = $data['postNewFriend'] ?? '';
+               $this->knowYou       = $data['knowYou'] ?? false;
+               $this->note          = $data['note'] ?? '';
+               $this->request       = $data['request'] ?? '';
+               $this->dfrnId        = -1;
+               $this->addr          = $data['addr'] ?? '';
+               $this->network       = $data['network'] ?? '';
+               $this->uid           = $data['uid'] ?? -1;
+               $this->keywords      = $data['keywords'] ?? '';
+               $this->location      = $data['location'] ?? '';
+               $this->about         = $data['about'] ?? '';
+       }
+
        public function getLabel(): string
        {
                return $this->label;
@@ -131,7 +159,7 @@ class Introduction implements \JsonSerializable
                return $this->postNewFriend;
        }
 
-       public function getKnowYou(): string
+       public function getKnowYou(): bool
        {
                return $this->knowYou;
        }
@@ -181,34 +209,6 @@ class Introduction implements \JsonSerializable
                return $this->about;
        }
 
-       public function __construct(array $data = [])
-       {
-               $this->label         = $data['label'] ?? '';
-               $this->type          = $data['str_type'] ?? '';
-               $this->intro_id      = $data['intro_id'] ?? -1;
-               $this->madeBy        = $data['madeBy'] ?? '';
-               $this->madeByUrl     = $data['madeByUrl'] ?? '';
-               $this->madeByZrl     = $data['madeByZrl'] ?? '';
-               $this->madeByAddr    = $data['madeByAddr'] ?? '';
-               $this->contactId     = $data['contactId'] ?? -1;
-               $this->photo         = $data['photo'] ?? '';
-               $this->name          = $data['name'] ?? '';
-               $this->url           = $data['url'] ?? '';
-               $this->zrl           = $data['zrl'] ?? '';
-               $this->hidden        = $data['hidden'] ?? false;
-               $this->postNewFriend = $data['postNewFriend'] ?? '';
-               $this->knowYou       = $data['knowYou'] ?? false;
-               $this->note          = $data['note'] ?? '';
-               $this->request       = $data['request'] ?? '';
-               $this->dfrnId        = -1;
-               $this->addr          = $data['addr'] ?? '';
-               $this->network       = $data['network'] ?? '';
-               $this->uid           = $data['uid'] ?? -1;
-               $this->keywords      = $data['keywords'] ?? '';
-               $this->location      = $data['location'] ?? '';
-               $this->about         = $data['about'] ?? '';
-       }
-
        /**
         * @inheritDoc
         */

diff --git a/src/Network/HTTPClient/Response/CurlResult.php b/src/Network/HTTPClient/Response/CurlResult.php
index a79023132a3f8a4165309412a15e5e2a31942b6d..30b8be38304cfb45bdfd72b0dc888bf6fa0e5d2d 100644 (file)
--- a/src/Network/HTTPClient/Response/CurlResult.php
+++ b/src/Network/HTTPClient/Response/CurlResult.php
@@ -246,7 +246,7 @@ class CurlResult implements ICanHandleHttpResponses
        /** {@inheritDoc} */
        public function getReturnCode(): string
        {
-               return $this->returnCode;
+               return (string) $this->returnCode;
        }
 
        /** {@inheritDoc} */

diff --git a/src/Network/HTTPClient/Response/GuzzleResponse.php b/src/Network/HTTPClient/Response/GuzzleResponse.php
index 0e246a0cb08e3761c23fc45a3be29bb0f10d4209..fde67cdd8ccc4248770877082100810ed6dbfbb6 100644 (file)
--- a/src/Network/HTTPClient/Response/GuzzleResponse.php
+++ b/src/Network/HTTPClient/Response/GuzzleResponse.php
@@ -100,7 +100,7 @@ class GuzzleResponse extends Response implements ICanHandleHttpResponses, Respon
        /** {@inheritDoc} */
        public function getReturnCode(): string
        {
-               return $this->getStatusCode();
+               return (string) $this->getStatusCode();
        }
 
        /** {@inheritDoc} */