Merge pull request #1025 from nextcloud/dependabot/composer/vendor-bin/psalm/vimeo/psalm-6.14.3

come-nc · web-flow · commit 8ade297e0b8e · 2026-01-08T18:30:53.000+01:00
build(deps-dev): bump vimeo/psalm from 5.26.1 to 6.14.3 in /vendor-bin/psalm
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
 		"cs:fix": "@php php-cs-fixer fix",
 		"cs:check": "@php php-cs-fixer fix --dry-run --diff",
 		"psalm": "@php psalm",
-		"psalm:fix": "@php psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
+		"psalm:fix": "@php psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType,MissingOverrideAttribute",
 		"psalm:update-baseline": "@php psalm --threads=1 --update-baseline",
 		"lint": "find . -name \\*.php -not -path '*/vendor/*' -print0 | xargs -0 -n1 php -l",
 		"rector:check": "rector --dry-run",
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -56,6 +56,7 @@ public function __construct(array $urlParams = []) {
 		parent::__construct('user_saml', $urlParams);
 	}
 
+	#[\Override]
 	public function register(IRegistrationContext $context): void {
 		$context->registerMiddleware(OnlyLoggedInMiddleware::class);
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadAdditionalScriptsListener::class);
@@ -72,6 +73,7 @@ public function register(IRegistrationContext $context): void {
 		));
 	}
 
+	#[\Override]
 	public function boot(IBootContext $context): void {
 		try {
 			$context->injectFn(function (
diff --git a/lib/Command/ConfigCreate.php b/lib/Command/ConfigCreate.php
@@ -20,6 +20,7 @@ public function __construct(
 		parent::__construct();
 	}
 
+	#[\Override]
 	protected function configure(): void {
 		$this->setName('saml:config:create');
 		$this->setDescription('Creates a new config and prints the new provider ID');
diff --git a/lib/Command/ConfigDelete.php b/lib/Command/ConfigDelete.php
@@ -22,6 +22,7 @@ public function __construct(
 		parent::__construct();
 	}
 
+	#[\Override]
 	protected function configure(): void {
 		$this->setName('saml:config:delete');
 
diff --git a/lib/Command/ConfigGet.php b/lib/Command/ConfigGet.php
@@ -21,6 +21,7 @@ public function __construct(
 		parent::__construct();
 	}
 
+	#[\Override]
 	protected function configure(): void {
 		$this->setName('saml:config:get');
 
diff --git a/lib/Command/ConfigSet.php b/lib/Command/ConfigSet.php
@@ -23,6 +23,7 @@ public function __construct(
 		parent::__construct();
 	}
 
+	#[\Override]
 	protected function configure(): void {
 		$this->setName('saml:config:set');
 
diff --git a/lib/Command/GetMetadata.php b/lib/Command/GetMetadata.php
@@ -24,6 +24,7 @@ public function __construct(
 		parent::__construct();
 	}
 
+	#[\Override]
 	protected function configure(): void {
 		$this
 			->setName('saml:metadata')
@@ -45,6 +46,7 @@ protected function configure(): void {
 		;
 	}
 
+	#[\Override]
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$idp = (int)$input->getArgument('idp');
 		$settingsArray = $this->samlSettings->getOneLoginSettingsArray($idp);
diff --git a/lib/Command/GroupMigrationCopyIncomplete.php b/lib/Command/GroupMigrationCopyIncomplete.php
@@ -21,6 +21,7 @@ public function __construct(
 	) {
 		parent::__construct();
 	}
+	#[\Override]
 	protected function configure(): void {
 		$this->setName('saml:group-migration:copy-incomplete-members');
 		$this->setDescription('Transfers remaining group members from old local to current SAML groups');
diff --git a/lib/Command/UserAdd.php b/lib/Command/UserAdd.php
@@ -24,6 +24,7 @@ public function __construct(
 	) {
 		parent::__construct();
 	}
+	#[\Override]
 	protected function configure(): void {
 		$this
 			->setName('saml:user:add')
diff --git a/lib/DavPlugin.php b/lib/DavPlugin.php
@@ -29,6 +29,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function initialize(Server $server): void {
 		$server->on('beforeMethod:*', $this->beforeMethod(...), 9);
 		$this->server = $server;
diff --git a/lib/GroupBackend.php b/lib/GroupBackend.php
@@ -35,6 +35,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function inGroup($uid, $gid): bool {
 		$qb = $this->dbc->getQueryBuilder();
 		$stmt = $qb->select('gid')
@@ -52,6 +53,7 @@ public function inGroup($uid, $gid): bool {
 	/**
 	 * @return list<string> Group names
 	 */
+	#[\Override]
 	public function getUserGroups($uid): array {
 		$qb = $this->dbc->getQueryBuilder();
 		$cursor = $qb->select('gid')
@@ -71,7 +73,8 @@ public function getUserGroups($uid): array {
 	/**
 	 * @return string[] Group names
 	 */
-	public function getGroups($search = '', $limit = null, $offset = null): array {
+	#[\Override]
+	public function getGroups(string $search = '', $limit = null, $offset = null): array {
 		$query = $this->dbc->getQueryBuilder();
 		$query->select('gid', 'displayname')
 			->from(self::TABLE_GROUPS)
@@ -108,6 +111,7 @@ public function getGroups($search = '', $limit = null, $offset = null): array {
 	 * @param string $gid
 	 * @return bool
 	 */
+	#[\Override]
 	public function groupExists($gid): bool {
 		if (isset($this->groupCache[$gid])) {
 			return true;
@@ -151,6 +155,7 @@ public function groupExistsWithDifferentGid(string $samlGid): ?string {
 	 * @param int $offset
 	 * @return array<int,string> User ids
 	 */
+	#[\Override]
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0): array {
 		$query = $this->dbc->getQueryBuilder();
 		$query->select('uid')
@@ -182,6 +187,7 @@ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0): arra
 		return $users;
 	}
 
+	#[\Override]
 	public function createGroup(string $gid, ?string $samlGid = null): bool {
 		try {
 			// Add group
@@ -213,6 +219,7 @@ public function createGroup(string $gid, ?string $samlGid = null): bool {
 	/**
 	 * @throws Exception
 	 */
+	#[\Override]
 	public function addToGroup(string $uid, string $gid): bool {
 		if ($this->inGroup($uid, $gid)) {
 			return true;
@@ -226,6 +233,7 @@ public function addToGroup(string $uid, string $gid): bool {
 		return true;
 	}
 
+	#[\Override]
 	public function removeFromGroup(string $uid, string $gid): bool {
 		$qb = $this->dbc->getQueryBuilder();
 		$rows = $qb->delete(self::TABLE_MEMBERS)
@@ -236,6 +244,7 @@ public function removeFromGroup(string $uid, string $gid): bool {
 		return $rows > 0;
 	}
 
+	#[\Override]
 	public function countUsersInGroup(string $gid, string $search = ''): int {
 		$query = $this->dbc->getQueryBuilder();
 		$query->select($query->func()->count('*', 'num_users'))
@@ -261,6 +270,7 @@ public function countUsersInGroup(string $gid, string $search = ''): int {
 		return $count;
 	}
 
+	#[\Override]
 	public function deleteGroup(string $gid): bool {
 		$query = $this->dbc->getQueryBuilder();
 
@@ -287,10 +297,12 @@ public function deleteGroup(string $gid): bool {
 		return true;
 	}
 
+	#[\Override]
 	public function getBackendName(): string {
 		return 'user_saml';
 	}
 
+	#[\Override]
 	public function getDisplayName(string $gid): string {
 		if (!isset($this->groupCache[$gid])) {
 			$this->getGroups($gid);
@@ -299,6 +311,7 @@ public function getDisplayName(string $gid): string {
 		return $this->groupCache[$gid] ?? $gid;
 	}
 
+	#[\Override]
 	public function setDisplayName(string $gid, string $displayName): bool {
 		if (!$this->groupExists($gid)) {
 			return false;
diff --git a/lib/GroupManager.php b/lib/GroupManager.php
@@ -144,7 +144,10 @@ protected function unassignUserFromGroup(IUser $user, string $gid): void {
 		}
 	}
 
-	protected function handleUserAssignedToGroups(IUser $user, $groupIds): void {
+	/**
+	 * @param array<string> $groupIds
+	 */
+	protected function handleUserAssignedToGroups(IUser $user, array $groupIds): void {
 		foreach ($groupIds as $gid) {
 			$this->assignUserToGroup($user, $gid);
 		}
diff --git a/lib/Jobs/CleanSessionData.php b/lib/Jobs/CleanSessionData.php
@@ -28,6 +28,7 @@ public function __construct(
 		$this->setAllowParallelRuns(false);
 	}
 
+	#[\Override]
 	protected function run(mixed $argument): void {
 		$missingSessionIds = $this->findInvalidatedSessions();
 		$this->deleteInvalidatedSessions($missingSessionIds);
diff --git a/lib/Jobs/MigrateGroups.php b/lib/Jobs/MigrateGroups.php
@@ -45,6 +45,7 @@ public function __construct(
 		parent::__construct($timeFactory);
 	}
 
+	#[\Override]
 	protected function run($argument) {
 		try {
 			$candidates = $this->getMigratableGroups();
diff --git a/lib/Listener/CookieLoginEventListener.php b/lib/Listener/CookieLoginEventListener.php
@@ -22,6 +22,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if ($event instanceof BeforeUserLoggedInWithCookieEvent) {
 			$this->prepareRestoreOfSession();
diff --git a/lib/Listener/LoadAdditionalScriptsListener.php b/lib/Listener/LoadAdditionalScriptsListener.php
@@ -26,6 +26,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof BeforeTemplateRenderedEvent) {
 			return;
diff --git a/lib/Listener/LoginEventListener.php b/lib/Listener/LoginEventListener.php
@@ -19,6 +19,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof UserLoggedInEvent
 			|| $event->isTokenLogin()
diff --git a/lib/Listener/SabrePluginEventListener.php b/lib/Listener/SabrePluginEventListener.php
@@ -17,6 +17,7 @@
 
 /** @template-implements IEventListener<SabrePluginAddEvent|Event> */
 class SabrePluginEventListener implements IEventListener {
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof SabrePluginAddEvent) {
 			return;
diff --git a/lib/Middleware/OnlyLoggedInMiddleware.php b/lib/Middleware/OnlyLoggedInMiddleware.php
@@ -33,6 +33,7 @@ public function __construct(
 	 * @param string $methodName
 	 * @throws \Exception
 	 */
+	#[\Override]
 	public function beforeController($controller, $methodName) {
 		if ($this->reflector->hasAnnotation('OnlyUnauthenticatedUsers') && $this->userSession->isLoggedIn()) {
 			throw new \Exception('User is already logged-in');
@@ -46,6 +47,7 @@ public function beforeController($controller, $methodName) {
 	 * @return RedirectResponse
 	 * @throws \Exception
 	 */
+	#[\Override]
 	public function afterException($controller, $methodName, \Exception $exception) {
 		if ($exception->getMessage() === 'User is already logged-in') {
 			return new RedirectResponse($this->urlGenerator->getAbsoluteURL('/'));
diff --git a/lib/Migration/CleanupRemovedConfig.php b/lib/Migration/CleanupRemovedConfig.php
@@ -21,13 +21,15 @@ public function __construct(
 	/**
 	 * @inheritDoc
 	 */
+	#[\Override]
 	public function getName() {
 		return 'Cleans up config keys that are not used anymore';
 	}
 
 	/**
 	 * @inheritDoc
 	 */
+	#[\Override]
 	public function run(IOutput $output) {
 		$this->config->deleteAppValue('user_saml', 'general-use_saml_auth_for_desktop');
 	}
diff --git a/lib/Migration/RememberLocalGroupsForPotentialMigrations.php b/lib/Migration/RememberLocalGroupsForPotentialMigrations.php
@@ -24,6 +24,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function getName(): string {
 		return 'Remember local groups that might belong to SAML';
 	}
@@ -36,6 +37,7 @@ public function getName(): string {
 	 * @throws \Exception in case of failure
 	 * @since 9.1.0
 	 */
+	#[\Override]
 	public function run(IOutput $output) {
 		$candidateInfo = $this->config->getAppValue('user_saml', GroupManager::LOCAL_GROUPS_CHECK_FOR_MIGRATION, '');
 		if ($candidateInfo !== '') {
diff --git a/lib/Migration/TransferGroupMembers.php b/lib/Migration/TransferGroupMembers.php
@@ -21,10 +21,12 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function getName(): string {
 		return 'Move potential left members from old local groups to SAML groups';
 	}
 
+	#[\Override]
 	public function run(IOutput $output): void {
 		$groupsToTreat = $this->groupMigration->findGroupsWithLocalMembers();
 		if (empty($groupsToTreat)) {
diff --git a/lib/Migration/Version3001Date20200630193443.php b/lib/Migration/Version3001Date20200630193443.php
@@ -20,6 +20,7 @@ class Version3001Date20200630193443 extends SimpleMigrationStep {
 	 * @param array $options
 	 * @return null|ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
diff --git a/lib/Migration/Version5000Date20211025124248.php b/lib/Migration/Version5000Date20211025124248.php
@@ -76,6 +76,7 @@ public function __construct(IDBConnection $dbc) {
 	 * @param array $options
 	 * @return null|ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
@@ -104,6 +105,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 	 * @param Closure():IschemaWrapper $schemaClosure
 	 * @param array $options
 	 */
+	#[\Override]
 	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
 		$prefixes = $this->fetchPrefixes();
 		foreach ($prefixes as $prefix) {
diff --git a/lib/Migration/Version6000Date20220912152700.php b/lib/Migration/Version6000Date20220912152700.php
@@ -21,6 +21,7 @@ class Version6000Date20220912152700 extends SimpleMigrationStep {
 	/**
 	 * @return null|ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
diff --git a/lib/Migration/Version6001Date20240202183823.php b/lib/Migration/Version6001Date20240202183823.php
@@ -23,6 +23,7 @@ class Version6001Date20240202183823 extends SimpleMigrationStep {
 	 * @param array $options
 	 * @return null|ISchemaWrapper
 	 */
+	#[\Override]
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
diff --git a/lib/Model/SessionData.php b/lib/Model/SessionData.php
@@ -45,6 +45,7 @@ public function storeInSession(ISession $session): void {
 		}
 	}
 
+	#[\Override]
 	public function jsonSerialize(): array {
 		return [
 			self::KEY_IDENTITY_PROVIDER_ID => $this->identityProviderId,
@@ -83,7 +84,8 @@ public static function fromSession(ISession $session): self {
 		return self::fromInputArray($retrievedData);
 	}
 
+	#[\Override]
 	public function __toString(): string {
-		return \json_encode($this);
+		return \json_encode($this, \JSON_THROW_ON_ERROR);
 	}
 }
diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
@@ -82,6 +82,7 @@ public function storeSessionDataInDatabase(): void {
 		$sessionDataModel = SessionDataModel::fromSession($this->session);
 
 		$sessionData = new SessionData();
+		/** @psalm-suppress InvalidArgument setId requires a string not an int */
 		$sessionData->setId($this->hashSessionId($this->session->getId()));
 		$sessionData->setTokenId($this->tokenProvider->getToken($this->session->getId())->getId());
 		$sessionData->setData($sessionDataModel);
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
diff --git a/lib/Settings/Section.php b/lib/Settings/Section.php
diff --git a/lib/UserBackend.php b/lib/UserBackend.php
diff --git a/lib/UserData.php b/lib/UserData.php
diff --git a/lib/UserResolver.php b/lib/UserResolver.php
diff --git a/psalm.xml b/psalm.xml
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public function __construct(array $urlParams = []) {`
`56`	`56`	`parent::__construct('user_saml', $urlParams);`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ #[\Override]`
`59`	`60`	`public function register(IRegistrationContext $context): void {`
`60`	`61`	`$context->registerMiddleware(OnlyLoggedInMiddleware::class);`
`61`	`62`	`$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadAdditionalScriptsListener::class);`
`@@ -72,6 +73,7 @@ public function register(IRegistrationContext $context): void {`
`72`	`73`	`));`
`73`	`74`	`}`
`74`	`75`
	`76`	`+ #[\Override]`
`75`	`77`	`public function boot(IBootContext $context): void {`
`76`	`78`	`try {`
`77`	`79`	`$context->injectFn(function (`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public function __construct(`
`20`	`20`	`parent::__construct();`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ #[\Override]`
`23`	`24`	`protected function configure(): void {`
`24`	`25`	`$this->setName('saml:config:create');`
`25`	`26`	`$this->setDescription('Creates a new config and prints the new provider ID');`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public function __construct(`
`22`	`22`	`parent::__construct();`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ #[\Override]`
`25`	`26`	`protected function configure(): void {`
`26`	`27`	`$this->setName('saml:config:delete');`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public function __construct(`
`21`	`21`	`parent::__construct();`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ #[\Override]`
`24`	`25`	`protected function configure(): void {`
`25`	`26`	`$this->setName('saml:config:get');`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public function __construct(`
`23`	`23`	`parent::__construct();`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ #[\Override]`
`26`	`27`	`protected function configure(): void {`
`27`	`28`	`$this->setName('saml:config:set');`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public function __construct(`
`24`	`24`	`parent::__construct();`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ #[\Override]`
`27`	`28`	`protected function configure(): void {`
`28`	`29`	`$this`
`29`	`30`	`->setName('saml:metadata')`
`@@ -45,6 +46,7 @@ protected function configure(): void {`
`45`	`46`	`;`
`46`	`47`	`}`
`47`	`48`
	`49`	`+ #[\Override]`
`48`	`50`	`protected function execute(InputInterface $input, OutputInterface $output): int {`
`49`	`51`	`$idp = (int)$input->getArgument('idp');`
`50`	`52`	`$settingsArray = $this->samlSettings->getOneLoginSettingsArray($idp);`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public function __construct(`
`29`	`29`	`) {`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ #[\Override]`
`32`	`33`	`public function initialize(Server $server): void {`
`33`	`34`	`$server->on('beforeMethod:*', $this->beforeMethod(...), 9);`
`34`	`35`	`$this->server = $server;`