Bump psalm/phar from 4.30.0 to 5.1.0

.github/workflows/static-analysis.yml

@@ -24,7 +24,7 @@ jobs:
           - name: Install dependencies
             run: composer i
           - name: Install OCP package
-            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} --ignore-platform-reqs
+            run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs
           - name: Run coding standards check
             run: composer run psalm
 

composer.json

@@ -45,8 +45,8 @@
 		"youthweb/urllinker": "^1.3"
 	},
 	"require-dev": {
-		"christophwurst/nextcloud": "^21.0.0",
-		"psalm/phar": "^4.6",
+		"nextcloud/ocp": "dev-stable25",
+		"psalm/phar": "^5.1",
 		"roave/security-advisories": "dev-master"
 	},
 	"autoload": {

lib/Account.php

@@ -166,7 +166,7 @@ public function getImapConnection() {
 			} catch (Horde_Imap_Client_Exception $e) {
 				throw new ServiceException(
 					"Could not connect to IMAP host $host:$port: " . $e->getMessage(),
-					(int) $e->getCode(),
+					$e->getCode(),
 					$e
 				);
 			}

lib/Cache/Cache.php

@@ -132,6 +132,7 @@ public function save(): void {
 				foreach (array_keys(array_flip($val['slice'])) as $slice) {
 					$data = [];
 					foreach (array_keys($s['s'], $slice) as $uid) {
+						/** @var int $uid */
 						$data[$uid] = is_array($d[$uid])
 							? serialize($d[$uid])
 							: $d[$uid];
@@ -387,7 +388,7 @@ protected function _loadUids($mailbox, $uids, $uidvalid = null): void {
 	 * @return void
 	 */
 	protected function _loadSlice($mailbox, $slice) {
-		$cache_id = $this->_getCid($mailbox, $slice);
+		$cache_id = $this->_getCid($mailbox, (string)$slice);
 
 		if (!empty($this->_loaded[$cache_id])) {
 			return;

lib/Db/MailboxMapper.php

@@ -23,9 +23,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * @template-extends QBMapper<Mailbox>
- */
 namespace OCA\Mail\Db;
 
 use OCA\Mail\Account;
@@ -41,6 +38,9 @@
 use OCP\IDBConnection;
 use function array_map;
 
+/**
+ * @template-extends QBMapper<Mailbox>
+ */
 class MailboxMapper extends QBMapper {
 	/** @var ITimeFactory */
 	private $timeFactory;

lib/Db/TrustedSenderMapper.php

@@ -28,6 +28,9 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\IDBConnection;
 
+/**
+ * @template-extends QBMapper<TrustedSender>
+ */
 class TrustedSenderMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'mail_trusted_senders');

lib/Exception/ClientException.php

@@ -28,8 +28,21 @@
 
 use Exception;
 use OCP\AppFramework\Http;
+use Throwable;
 
 class ClientException extends Exception {
+	/**
+	 * @param string $message [optional] The Exception message to throw.
+	 * @param mixed $code [optional] The Exception code.
+	 * @param null|Throwable $previous [optional] The previous throwable used for the exception chaining.
+	 */
+	public function __construct($message = "", $code = 0, Throwable $previous = null) {
+		if (!is_int($code)) {
+			$code = (int)$code;
+		}
+		parent::__construct($message, $code, $previous);
+	}
+
 	public function getHttpCode(): int {
 		return Http::STATUS_BAD_REQUEST;
 	}

lib/Exception/CouldNotConnectException.php

@@ -42,7 +42,7 @@ class CouldNotConnectException extends ServiceException {
 	public function __construct(Throwable $previous, string $service, string $host, int $port) {
 		parent::__construct(
 			"Connection to {$service} at {$host}:{$port} failed. {$previous->getMessage()}",
-			(int)$previous->getCode(),
+			$previous->getCode(),
 			$previous
 		);
 		$this->service = $service;

lib/Exception/ServiceException.php

@@ -24,6 +24,18 @@
 namespace OCA\Mail\Exception;
 
 use Exception;
+use Throwable;
 
 class ServiceException extends Exception {
+	/**
+	 * @param string $message [optional] The Exception message to throw.
+	 * @param mixed $code [optional] The Exception code.
+	 * @param null|Throwable $previous [optional] The previous throwable used for the exception chaining.
+	 */
+	public function __construct($message = "", $code = 0, Throwable $previous = null) {
+		if (!is_int($code)) {
+			$code = (int)$code;
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

lib/IMAP/MailboxSync.php

@@ -106,7 +106,7 @@ public function sync(Account $account,
 			} catch (Horde_Imap_Client_Exception $e) {
 				throw new ServiceException(
 					sprintf("IMAP error synchronizing account %d: %s", $account->getId(), $e->getMessage()),
-					(int)$e->getCode(),
+					$e->getCode(),
 					$e
 				);
 			}
@@ -146,7 +146,7 @@ public function syncStats(Account $account, Mailbox $mailbox): void {
 			$id = $mailbox->getId();
 			throw new ServiceException(
 				"Could not fetch stats of mailbox $id. IMAP error: " . $e->getMessage(),
-				(int)$e->getCode(),
+				$e->getCode(),
 				$e
 			);
 		} finally {

lib/IMAP/MessageMapper.php

@@ -442,7 +442,7 @@ public function getFullText(Horde_Imap_Client_Socket $client,
 		} catch (Horde_Imap_Client_Exception $e) {
 			throw new ServiceException(
 				"Could not fetch message source: " . $e->getMessage(),
-				(int) $e->getCode(),
+				$e->getCode(),
 				$e
 			);
 		}

lib/Listener/AccountSynchronizedThreadUpdaterListener.php

@@ -36,6 +36,9 @@
 use function array_chunk;
 use function iterator_to_array;
 
+/**
+ * @template-implements IEventListener<Event|SynchronizationEvent>
+ */
 class AccountSynchronizedThreadUpdaterListener implements IEventListener {
 	private const WRITE_IDS_CHUNK_SIZE = 500;
 

lib/Listener/AddressCollectionListener.php

@@ -33,6 +33,9 @@
 use Psr\Log\LoggerInterface;
 use Throwable;
 
+/**
+ * @template-implements IEventListener<Event|MessageSentEvent>
+ */
 class AddressCollectionListener implements IEventListener {
 	/** @var IUserPreferences */
 	private $preferences;

lib/Listener/AntiAbuseListener.php

@@ -32,6 +32,9 @@
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @template-implements IEventListener<Event|BeforeMessageSentEvent>
+ */
 class AntiAbuseListener implements IEventListener {
 	/** @var IUserManager */
 	private $userManager;

lib/Listener/DashboardPanelListener.php

@@ -35,6 +35,9 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/**
+ * @template-implements IEventListener<Event|RegisterWidgetEvent>
+ */
 class DashboardPanelListener implements IEventListener {
 	/**
 	 * @inheritDoc

lib/Listener/DeleteDraftListener.php

@@ -43,6 +43,9 @@
 use OCP\EventDispatcher\IEventListener;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @template-implements IEventListener<Event|DraftSavedEvent|OutboxMessageCreatedEvent|DraftMessageCreatedEvent>
+ */
 class DeleteDraftListener implements IEventListener {
 	/** @var IMAPClientFactory */
 	private $imapClientFactory;