feat(psalm): Add all stubs

.php-cs-fixer.dist.php

@@ -17,5 +17,6 @@
 	->notPath('l10n')
 	->notPath('src')
 	->notPath('vendor')
+	->notPath('tests/stubs')
 	->in(__DIR__);
 return $config;

REUSE.toml

@@ -40,3 +40,21 @@ path = ["img/circles-dark.svg", "img/circles.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2018-2024 Google LLC"
 SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = ["tests/stubs/doctrine_dbal_**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "none"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ["tests/stubs/symfony_component_**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "none"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = ["tests/stubs/stecman_component_**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "none"
+SPDX-License-Identifier = "MIT"

composer.json

@@ -25,19 +25,19 @@
   "scripts": {
     "cs:check": "php-cs-fixer fix --dry-run --diff",
     "cs:fix": "php-cs-fixer fix",
-    "psalm": "psalm.phar --threads=1 --update-baseline",
-    "psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
+    "psalm": "psalm.phar --threads=1 --no-cache",
+    "psalm:update-baseline": "psalm.phar --threads=1  --no-cache --update-baseline",
     "psalm:clear": "psalm.phar --clear-cache && psalm.phar --clear-global-cache",
     "psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
     "test": [
       "@test:unit"
     ],
     "test:unit": "vendor/bin/phpunit -c tests/phpunit.xml",
-    "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l"
+    "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './tests/stubs/*' -print0 | xargs -0 -n1 php -l"
   },
   "require-dev": {
     "phpunit/phpunit": "^10.5",
-    "psalm/phar": "^5.22",
+    "psalm/phar": "^6.7",
     "nextcloud/ocp": "dev-master",
     "nextcloud/coding-standard": "^1.2"
   }

lib/CirclesQueryHelper.php

@@ -31,7 +31,7 @@ class CirclesQueryHelper {
 	/** @var CoreRequestBuilder */
 	private $coreRequestBuilder;
 
-	/** @var CoreQueryBuilder */
+	/** @var CoreQueryBuilder&IQueryBuilder */
 	private $queryBuilder;
 
 	/** @var FederatedUserService */
@@ -54,9 +54,9 @@ public function __construct(
 
 
 	/**
-	 * @return IQueryBuilder
+	 * @return CoreQueryBuilder&IQueryBuilder
 	 */
-	public function getQueryBuilder(): IQueryBuilder {
+	public function getQueryBuilder(): CoreQueryBuilder {
 		$this->queryBuilder = $this->coreRequestBuilder->getQueryBuilder();
 
 		return $this->queryBuilder;

lib/Command/CirclesCheck.php

@@ -39,6 +39,7 @@
 use OCA\Circles\Tools\Traits\TNCRequest;
 use OCA\Circles\Tools\Traits\TStringTools;
 use OCP\IAppConfig;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -181,6 +182,7 @@ private function checkLoopback(InputInterface $input, OutputInterface $output, s
 		$output->writeln('- <comment>You do not have a valid loopback address setup right now.</comment>');
 		$output->writeln('');
 
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 		while (true) {
 			$question = new Question('<info>Please write down a new loopback address to test</info>: ', '');
@@ -265,13 +267,13 @@ private function testLoopback(InputInterface $input, OutputInterface $output): b
 			return false;
 		}
 
-		$timer = round(microtime(true) * 1000);
+		$timer = round(microtime(true) * 1000.0);
 		$output->write('- Creating async FederatedEvent ');
 		$test = new FederatedEvent(LoopbackTest::class);
 		$this->federatedEventService->newEvent($test);
 		$output->writeln(
 			'<info>' . $test->getWrapperToken() . '</info> ' .
-			'(took ' . (round(microtime(true) * 1000) - $timer) . 'ms)'
+			'(took ' . ((string)(round(microtime(true) * 1000.0) - $timer)) . 'ms)'
 		);
 
 		$output->writeln('- Waiting for async process to finish (5s)');
@@ -290,18 +292,18 @@ private function testLoopback(InputInterface $input, OutputInterface $output): b
 
 		$checkVerify = $wrapper->getEvent()->getData()->gInt('verify');
 		if ($checkVerify === LoopbackTest::VERIFY) {
-			$output->write('<info>verify=' . $checkVerify . '</info> ');
+			$output->write('<info>verify=' . ((string)$checkVerify) . '</info> ');
 		} else {
-			$output->writeln('<error>verify=' . $checkVerify . '</error>');
+			$output->writeln('<error>verify=' . ((string)$checkVerify) . '</error>');
 
 			return false;
 		}
 
 		$checkManage = $wrapper->getResult()->gInt('manage');
 		if ($checkManage === LoopbackTest::MANAGE) {
-			$output->write('<info>manage=' . $checkManage . '</info> ');
+			$output->write('<info>manage=' . ((string)$checkManage) . '</info> ');
 		} else {
-			$output->writeln('<error>manage=' . $checkManage . '</error>');
+			$output->writeln('<error>manage=' . ((string)$checkManage) . '</error>');
 
 			return false;
 		}
@@ -328,6 +330,7 @@ private function saveLoopback(InputInterface $input, OutputInterface $output, st
 			false, '/^(y|Y)/i'
 		);
 
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 		if (!$helper->ask($input, $output, $question)) {
 			$output->writeln('skipping.');
@@ -364,6 +367,7 @@ private function checkInternal(InputInterface $input, OutputInterface $output, s
 			'- <comment>Do you want to enable this feature ?</comment> (y/N) ', false, '/^(y|Y)/i'
 		);
 
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 		if (!$helper->ask($input, $output, $question)) {
 			$output->writeln('skipping.');
@@ -508,6 +512,7 @@ private function saveInternal(InputInterface $input, OutputInterface $output, st
 			false, '/^(y|Y)/i'
 		);
 
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 		if (!$helper->ask($input, $output, $question)) {
 			$output->writeln('skipping.');
@@ -543,6 +548,7 @@ private function checkFrontal(InputInterface $input, OutputInterface $output, st
 			'- <comment>Do you want to enable this feature ?</comment> (y/N) ', false, '/^(y|Y)/i'
 		);
 
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 		if (!$helper->ask($input, $output, $question)) {
 			$output->writeln('skipping.');
@@ -686,6 +692,7 @@ private function saveFrontal(InputInterface $input, OutputInterface $output, str
 			false, '/^(y|Y)/i'
 		);
 
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 		if (!$helper->ask($input, $output, $question)) {
 			$output->writeln('skipping.');
@@ -733,7 +740,7 @@ private function testRequest(
 				$color = 'info';
 			}
 
-			$output->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>');
+			$output->writeln('<' . $color . '>' . ((string)$result->getStatusCode()) . '</' . $color . '>');
 			if ($result->getStatusCode() === 200) {
 				return true;
 			}
@@ -759,6 +766,7 @@ private function saveUrl(InputInterface $input, OutputInterface $output, string
 			'The address <info>' . $address . '</info> seems to reach your local Nextcloud.'
 		);
 
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 		$output->writeln('');
 		$question = new ConfirmationQuestion(
@@ -801,7 +809,7 @@ private function parseAddress(string $test): array {
 		$path = rtrim($path, '/');
 
 		if (!is_null($cloudIdPort)) {
-			$cloudId = $cloudId . ':' . $cloudIdPort;
+			$cloudId = $cloudId . ':' . ((string)$cloudIdPort);
 		}
 
 		return [$scheme, $cloudId, $path];

lib/Command/CirclesConfig.php

@@ -116,7 +116,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
 				);
 			}
 

lib/Command/CirclesCreate.php

@@ -104,7 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
 				);
 			}
 

lib/Command/CirclesDestroy.php

@@ -108,7 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
 				);
 			}
 

lib/Command/CirclesDetails.php

@@ -158,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
 				);
 			}
 

lib/Command/CirclesEdit.php

@@ -100,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
 				);
 			}
 

lib/Command/CirclesJoin.php

@@ -119,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
 				);
 			}
 

lib/Command/CirclesLeave.php

@@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		} catch (FederatedItemException $e) {
 			if ($input->getOption('status-code')) {
 				throw new FederatedItemException(
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
+					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
 				);
 			}
 

lib/Command/CirclesList.php

@@ -237,9 +237,9 @@ private function displayCircles(array $circles): void {
 					Circle::$DEF_SOURCE[$circle->getSource()],
 					$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
 					$this->configService->displayInstance($owner->getInstance()),
-					$circle->getPopulation() . '/'
-					. $this->getInt('members_limit', $circle->getSettings(), -1)
-					. ' (' . $circle->getPopulationInherited() . ')'
+					((string)$circle->getPopulation()) . '/'
+					. ((string)$this->getInt('members_limit', $circle->getSettings(), -1))
+					. ' (' . ((string)$circle->getPopulationInherited()) . ')'
 				]
 			);
 		}

lib/Command/CirclesMaintenance.php

@@ -16,6 +16,7 @@
 use OCA\Circles\Service\MaintenanceService;
 use OCA\Circles\Service\OutputService;
 use OCP\IDBConnection;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -92,6 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				'/^(y|Y)/i'
 			);
 
+			/** @var QuestionHelper $helper */
 			$helper = $this->getHelper('question');
 			if (!$helper->ask($input, $output, $question)) {
 				$output->writeln('aborted.');
@@ -107,6 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				. '\'</comment>: ', ''
 			);
 
+			/** @var QuestionHelper $helper */
 			$helper = $this->getHelper('question');
 			$confirmation = $helper->ask($input, $output, $question);
 			if (strtolower($confirmation) !== $action) {

lib/Command/CirclesMemberships.php

@@ -204,7 +204,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
+			$output->writeln('(' . ((string)$count) . ' entries generated/updated in the database)');
 		}
 
 		foreach ($federatedUser->getMemberships() as $membership) {
@@ -379,6 +379,6 @@ private function manageAllMemberships() {
 			);
 		}
 
-		$output->writeln($count . ' memberships updated');
+		$output->writeln(((string)$count) . ' memberships updated');
 	}
 }

lib/Command/CirclesRemote.php

@@ -29,6 +29,7 @@
 use OCA\Circles\Tools\Model\NCSignedRequest;
 use OCA\Circles\Tools\Traits\TNCWellKnown;
 use OCA\Circles\Tools\Traits\TStringTools;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -246,7 +247,7 @@ private function requestInstance(string $host): void {
 
 		$result = $signedRequest->getOutgoingRequest()->getResult();
 		$code = $result->getStatusCode();
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code));
+		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . ((string)$code) . '</info>' : $code));
 		$this->output->writeln(
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
 		);
@@ -318,6 +319,7 @@ private function requestInstance(string $host): void {
 	 */
 	private function saveRemote(RemoteInstance $remoteSignatory) {
 		$this->output->writeln('');
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(
@@ -349,6 +351,7 @@ private function saveRemote(RemoteInstance $remoteSignatory) {
 	 */
 	private function updateRemote(RemoteInstance $remoteSignatory): void {
 		$this->output->writeln('');
+		/** @var QuestionHelper $helper */
 		$helper = $this->getHelper('question');
 
 		$this->output->writeln(