Merge pull request #1131 from nextcloud/chore/noid/psalm6

Use psalm 6.7

Author: julien-nc

composer.json

@@ -7,9 +7,6 @@
     "classmap-authoritative": true,
     "allow-plugins": {
       "bamarni/composer-bin-plugin": true
-    },
-	"platform": {
-      "php": "8.0"
     }
   },
   "scripts": {
@@ -41,7 +38,7 @@
     "symfony/event-dispatcher": "^4",
     "phpunit/phpunit": "^9.5",
     "nextcloud/ocp": "dev-stable28",
-    "psalm/phar": "^5.20"
+    "psalm/phar": "6.7.x"
   },
   "extra": {
     "mozart": {

composer.lock

@@ -142,7 +142,7 @@ public function login(int $providerId, ?string $redirectUrl = null) {
 		if (!$this->isSecure()) {
 			return $this->buildProtocolErrorResponse();
 		}
-		$this->logger->debug('Initiating login for provider with id: ' . $providerId);
+		$this->logger->debug('Initiating login for provider with id: ' . strval($providerId));
 
 		try {
 			$provider = $this->providerMapper->getProvider($providerId);

lib/Controller/LoginController.php

@@ -102,7 +102,7 @@ public function buildAuthorizationUrl(string $authorizationEndpoint, array $extr
 		$urlWithoutParams =
 			(isset($parsedUrl['scheme']) ? $parsedUrl['scheme'] . '://' : '')
 			. ($parsedUrl['host'] ?? '')
-			. (isset($parsedUrl['port']) ? ':' . $parsedUrl['port'] : '')
+			. (isset($parsedUrl['port']) ? ':' . strval($parsedUrl['port']) : '')
 			. ($parsedUrl['path'] ?? '');
 
 		$queryParams = $extraGetParameters;

lib/Service/DiscoveryService.php

@@ -19,7 +19,7 @@ public function __construct(
 
 	public function getId(int $providerId, string $id, bool $id4me = false): string {
 		if ($this->providerService->getSetting($providerId, ProviderService::SETTING_UNIQUE_UID, '1') === '1' || $id4me) {
-			$newId = $providerId . '_';
+			$newId = strval($providerId) . '_';
 
 			if ($id4me) {
 				$newId .= '1_';

lib/Service/LocalIdService.php

@@ -134,7 +134,7 @@ public function getSetting(int $providerId, string $key, string $default = ''):
 	}
 
 	private function getSettingsKey(int $providerId, string $key): string {
-		return 'provider-' . $providerId . '-' . $key;
+		return 'provider-' . strval($providerId) . '-' . $key;
 	}
 
 	private function getSupportedSettings(): array {

lib/Service/ProviderService.php

@@ -83,14 +83,14 @@ public function getToken(bool $refreshIfExpired = true): ?Token {
 		$token = new Token(json_decode($sessionData, true, 512, JSON_THROW_ON_ERROR));
 		// token is still valid
 		if (!$token->isExpired()) {
-			$this->logger->debug('[TokenService] getToken: token is still valid, it expires in ' . $token->getExpiresInFromNow() . ' and refresh expires in ' . $token->getRefreshExpiresInFromNow());
+			$this->logger->debug('[TokenService] getToken: token is still valid, it expires in ' . strval($token->getExpiresInFromNow()) . ' and refresh expires in ' . strval($token->getRefreshExpiresInFromNow()));
 			return $token;
 		}
 
 		// token has expired
 		// try to refresh the token if there is a refresh token and it is still valid
 		if ($refreshIfExpired && $token->getRefreshToken() !== null && !$token->refreshIsExpired()) {
-			$this->logger->debug('[TokenService] getToken: token is expired and refresh token is still valid, refresh expires in ' . $token->getRefreshExpiresInFromNow());
+			$this->logger->debug('[TokenService] getToken: token is expired and refresh token is still valid, refresh expires in ' . strval($token->getRefreshExpiresInFromNow()));
 			return $this->refresh($token);
 		}
 

lib/Service/TokenService.php

@@ -9,6 +9,7 @@
 	findUnusedBaselineEntry="true"
 	findUnusedCode="false"
 	resolveFromConfigFile="true"
+	ensureOverrideAttribute="false"
 	phpVersion="8.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="https://getpsalm.org/schema/config"
@@ -61,12 +62,6 @@
 				<referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
 			</errorLevel>
 		</UndefinedDocblockClass>
-		<InvalidClass>
-			<errorLevel type="suppress">
-				<referencedClass name="OCP\Db\Exception" />
-				<referencedClass name="OCP\AppFramework\Db\QBMapper" />
-			</errorLevel>
-		</InvalidClass>
 	</issueHandlers>
 	<stubs>
 		<file name="tests/stubs/oc_util.php" />