[stable33] chore(psalm): Update to psalm 6

composer.json

@@ -24,10 +24,11 @@
 		"test:unit": "phpunit -c tests/phpunit.xml tests/Unit",
 		"test:unit:dev": "phpunit -c tests/phpunit.xml tests/Unit --no-coverage",
 		"post-install-cmd": ["@composer bin all install --ansi"],
-		"psalm": "psalm --threads=1",
-		"psalm:update-baseline": "psalm --threads=1 --update-baseline",
-		"psalm:update-baseline:force": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
-		"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache"
+		"psalm": "psalm.phar --threads=1",
+		"psalm:fix": "psalm.phar --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType,MissingOverrideAttribute",
+		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
+		"psalm:update-baseline:force": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
+		"psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache"
 	},
 	"config": {
 		"sort-packages": true,

lib/AppInfo/Application.php

@@ -29,6 +29,7 @@ public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 	}
 
+	#[\Override]
 	public function register(IRegistrationContext $context): void {
 		include_once __DIR__ . '/../../vendor/autoload.php';
 
@@ -39,6 +40,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerNotifierService(Notifier::class);
 	}
 
+	#[\Override]
 	public function boot(IBootContext $context): void {
 		$context->injectFn(function (IEventDispatcher $dispatcher) {
 			$loginHookAdapter = new class($dispatcher) {

lib/BackgroundJob/ETLJob.php

@@ -31,6 +31,7 @@ public function __construct(ETLService $etlService,
 	 *
 	 * @return void
 	 */
+	#[\Override]
 	protected function run($argument) {
 		$this->etlService->extractAndTransform();
 	}

lib/BackgroundJob/TrainIpV4OnceJob.php

@@ -33,6 +33,7 @@ public function __construct(
 	 *
 	 * @return void
 	 */
+	#[\Override]
 	protected function run($argument) {
 		try {
 			$strategy = new Ipv4Strategy();

lib/BackgroundJob/TrainIpV6OnceJob.php

@@ -33,6 +33,7 @@ public function __construct(
 	 *
 	 * @return void
 	 */
+	#[\Override]
 	protected function run($argument) {
 		try {
 			$strategy = new IpV6Strategy();

lib/BackgroundJob/TrainJobIpV4.php

@@ -41,6 +41,7 @@ public function __construct(
 	 *
 	 * @return void
 	 */
+	#[\Override]
 	protected function run($argument) {
 		try {
 			$strategy = new Ipv4Strategy();

lib/BackgroundJob/TrainJobIpV6.php

@@ -41,6 +41,7 @@ public function __construct(
 	 *
 	 * @return void
 	 */
+	#[\Override]
 	protected function run($argument) {
 		try {
 			$strategy = new IpV6Strategy();

lib/Db/Model.php

@@ -65,6 +65,7 @@ class Model extends Entity implements JsonSerializable {
 	protected $createdAt;
 	protected $addressType;
 
+	#[\Override]
 	#[ReturnTypeWillChange]
 	public function jsonSerialize(): array {
 		return [

lib/Listener/LoginListener.php

@@ -44,6 +44,7 @@ public function __construct(IRequest $request,
 		$this->loginClassifier = $loginClassifier;
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!($event instanceof PostLoginEvent)) {
 			// Unrelated

lib/Listener/LoginMailListener.php

@@ -34,6 +34,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!($event instanceof SuspiciousLoginEvent)) {
 			return;

lib/Listener/LoginNotificationListener.php

@@ -28,6 +28,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!($event instanceof SuspiciousLoginEvent)) {
 			return;

lib/Migration/Version0Date20181127130604.php

@@ -22,6 +22,7 @@ class Version0Date20181127130604 extends SimpleMigrationStep {
 	 * @param array $options
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version0Date20181213090142.php

@@ -23,6 +23,7 @@ class Version0Date20181213090142 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version0Date20181214080456.php

@@ -23,6 +23,7 @@ class Version0Date20181214080456 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version0Date20181214083108.php

@@ -23,6 +23,7 @@ class Version0Date20181214083108 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version0Date20181214103754.php

@@ -25,6 +25,7 @@ class Version0Date20181214103754 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper|null
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version0Date20190115134303.php

@@ -23,6 +23,7 @@ class Version0Date20190115134303 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper|null
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version0Date20190121184304.php

@@ -23,6 +23,7 @@ class Version0Date20190121184304 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version0Date20190123142603.php

@@ -21,6 +21,7 @@ class Version0Date20190123142603 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version2Date20190906100917.php

@@ -22,6 +22,7 @@ class Version2Date20190906100917 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version2Date20190913144908.php

@@ -21,6 +21,7 @@ class Version2Date20190913144908 extends SimpleMigrationStep {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version4002Date20220922094803.php

@@ -33,6 +33,7 @@ public function __construct(IDBConnection $connection) {
 	 *
 	 * @return ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
@@ -69,6 +70,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		return $schema;
 	}
 
+	#[\Override]
 	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version4002Date20220922094804.php

@@ -23,6 +23,7 @@ class Version4002Date20220922094804 extends SimpleMigrationStep {
 	 *
 	 * @return null|ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

lib/Migration/Version9000Date20250114095826.php

@@ -23,6 +23,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
 		$this->jobList->add(TrainIpV4OnceJob::class);
 		$this->jobList->add(TrainIpV6OnceJob::class);

lib/Notifications/Notifier.php

@@ -40,14 +40,17 @@ public function __construct(IFactory $factory, IRequest $request, IConfig $confi
 		$this->url = $urlGenerator;
 	}
 
+	#[\Override]
 	public function getID(): string {
 		return Application::APP_ID;
 	}
 
+	#[\Override]
 	public function getName(): string {
 		return $this->factory->get(Application::APP_ID)->t('Suspicious Login');
 	}
 
+	#[\Override]
 	public function prepare(INotification $notification, string $languageCode): INotification {
 		if ($notification->getApp() !== Application::APP_ID) {
 			// Not my app => throw

lib/Service/AClassificationStrategy.php

@@ -70,7 +70,11 @@ protected function uidAsFeatureVector(string $uid): array {
 		return $this->numStringsToBitArray($splitHash, 16, 4);
 	}
 
-	protected function numStringsToBitArray(array $strings, $base, $padding): array {
+	/**
+	 * @psalm-param 10|16 $base
+	 * @psalm-param 4|8 $padding
+	 */
+	protected function numStringsToBitArray(array $strings, int $base, int $padding): array {
 		$converted = array_reduce(array_map(function (string $s) use ($base, $padding) {
 			return $this->numStringToBitArray($s, $base, $padding);
 		}, $strings), 'array_merge', []);

lib/Service/IpV6Strategy.php

@@ -21,18 +21,22 @@
 use function substr;
 
 class IpV6Strategy extends AClassificationStrategy {
+	#[\Override]
 	public static function getTypeName(): string {
 		return 'ipv6';
 	}
 
+	#[\Override]
 	public function hasSufficientData(LoginAddressAggregatedMapper $loginAddressMapper, int $validationDays): bool {
 		return $loginAddressMapper->hasSufficientIpV6Data($validationDays);
 	}
 
+	#[\Override]
 	public function findHistoricAndRecent(LoginAddressAggregatedMapper $loginAddressMapper, int $validationThreshold, int $maxAge): array {
 		return $loginAddressMapper->findHistoricAndRecentIpv6($validationThreshold, $maxAge);
 	}
 
+	#[\Override]
 	protected function ipToVec(string $ip): array {
 		$addr = inet_pton($ip);
 		if ($addr === false) {
@@ -54,16 +58,19 @@ function (string $bit) {
 		);
 	}
 
+	#[\Override]
 	public function generateRandomIp(): string {
 		return implode(':', array_map(function (int $index) {
 			return base_convert((string)random_int(0, 2 ** 16 - 1), 10, 16);
 		}, range(0, 7)));
 	}
 
+	#[\Override]
 	public function getSize(): int {
 		return 16 + 64;
 	}
 
+	#[\Override]
 	public function getDefaultMlpConfig(): Config {
 		return Config::default()->setEpochs(20);
 	}

lib/Service/Ipv4Strategy.php

@@ -15,38 +15,46 @@
 use function explode;
 
 class Ipv4Strategy extends AClassificationStrategy {
+	#[\Override]
 	public static function getTypeName(): string {
 		return 'ipv4';
 	}
 
+	#[\Override]
 	public function hasSufficientData(LoginAddressAggregatedMapper $loginAddressMapper, int $validationDays): bool {
 		return $loginAddressMapper->hasSufficientIpV4Data($validationDays);
 	}
 
+	#[\Override]
 	public function findHistoricAndRecent(LoginAddressAggregatedMapper $loginAddressMapper, int $validationThreshold, int $maxAge): array {
 		return $loginAddressMapper->findHistoricAndRecentIpv4($validationThreshold, $maxAge);
 	}
 
+	#[\Override]
 	public function generateRandomIpVector(): array {
 		$ip = $this->generateRandomIp();
 		$splitIp = explode('.', $ip);
 		return $this->numStringsToBitArray($splitIp, 10, 8);
 	}
 
+	#[\Override]
 	protected function ipToVec(string $ip): array {
 		return $this->numStringsToBitArray(explode('.', $ip), 10, 8);
 	}
 
+	#[\Override]
 	public function generateRandomIp(): string {
 		return implode('.', array_map(function (int $index) {
 			return random_int(0, 255);
 		}, range(0, 3)));
 	}
 
+	#[\Override]
 	public function getSize(): int {
 		return 16 + 32;
 	}
 
+	#[\Override]
 	public function getDefaultMlpConfig(): Config {
 		return Config::default();
 	}

lib/Service/Statistics/AppStatistics.php

@@ -71,6 +71,7 @@ public function getTrainingDataStatistics(): TrainingDataStatistics {
 		return $this->trainingDataStatistics;
 	}
 
+	#[\Override]
 	#[ReturnTypeWillChange]
 	public function jsonSerialize(): array {
 		return [

lib/Service/Statistics/TrainingDataStatistics.php

@@ -40,6 +40,7 @@ public function getLoginsAggregated(): int {
 		return $this->loginsAggregated;
 	}
 
+	#[\Override]
 	#[ReturnTypeWillChange]
 	public function jsonSerialize(): array {
 		return [

lib/Service/TrainingDataConfig.php

@@ -90,6 +90,7 @@ public function setNow(int $now): TrainingDataConfig {
 		return $clone;
 	}
 
+	#[\Override]
 	#[ReturnTypeWillChange]
 	public function jsonSerialize(): array {
 		return [

lib/Task/TrainTask.php

@@ -39,6 +39,7 @@ public function __construct(Config $config,
 		$this->strategy = $strategy;
 	}
 
+	#[\Override]
 	public function run(Environment $environment) {
 		// TODO: only works if the app is placed into a sub-sub directory of Nextcloud
 		require_once __DIR__ . '/../../../../lib/base.php';

psalm.xml

@@ -4,6 +4,7 @@
 		errorLevel="4"
 		findUnusedBaselineEntry="true"
 		findUnusedCode="false"
+        strictBinaryOperands="false"
 		phpVersion="8.2"
 		resolveFromConfigFile="true"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -24,11 +25,19 @@
 	<extraFiles>
 		<directory name="vendor" />
 		<directory name="vendor-bin/psalm/vendor/nextcloud/ocp" />
+		<directory name="vendor-bin/psalm/vendor/psr" />
 	</extraFiles>
 	<stubs>
 		<file name="tests/stubs/doctrine_dbal_types_type.php" />
 	</stubs>
 	<issueHandlers>
+		<UndefinedClass>
+			<errorLevel type="suppress">
+				<referencedClass name="Symfony\Component\Console\Command\Command" />
+				<referencedClass name="Symfony\Component\Console\Output\OutputInterface" />
+				<referencedClass name="Symfony\Component\Console\Helper\ProgressBar" />
+			</errorLevel>
+		</UndefinedClass>
 		<UndefinedDocblockClass>
 			<errorLevel type="suppress">
 				<referencedClass name="Doctrine\DBAL\Driver\Statement" />