From 177bf687a4d5c2967d33d24e3c76ef40589b5bea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 01:50:34 +0000 Subject: [PATCH 1/2] Chore(deps-dev): Bump nextcloud/coding-standard from 1.4.0 to 1.5.0 Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/nextcloud/coding-standard/releases) - [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextcloud/coding-standard/compare/v1.4.0...v1.5.0) --- updated-dependencies: - dependency-name: nextcloud/coding-standard dependency-version: 1.5.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 56 +++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/composer.lock b/composer.lock index 0bf30538..bf2619d1 100644 --- a/composer.lock +++ b/composer.lock @@ -359,16 +359,16 @@ }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.36.1", + "version": "v3.37.2", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "ec9776e80f5ea9bf0d8ec16d662e431bfab19a24" + "reference": "678df979ce743466b42ddb6eea46b3f4c9a7bade" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/ec9776e80f5ea9bf0d8ec16d662e431bfab19a24", - "reference": "ec9776e80f5ea9bf0d8ec16d662e431bfab19a24", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/678df979ce743466b42ddb6eea46b3f4c9a7bade", + "reference": "678df979ce743466b42ddb6eea46b3f4c9a7bade", "shasum": "" }, "require": { @@ -378,7 +378,7 @@ "php": "^7.4 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^9.6.24 || ^10.5.51 || ^11.5.44" + "phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.55" }, "type": "library", "autoload": { @@ -399,7 +399,7 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.36.1" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.37.2" }, "funding": [ { @@ -407,7 +407,7 @@ "type": "github" } ], - "time": "2026-03-07T11:35:13+00:00" + "time": "2026-05-12T16:22:19+00:00" }, { "name": "myclabs/deep-copy", @@ -471,16 +471,16 @@ }, { "name": "nextcloud/coding-standard", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "8e06808c1423e9208d63d1bd205b9a38bd400011" + "reference": "80547a93236fbb9c783e05f0f0899043851b0dba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/8e06808c1423e9208d63d1bd205b9a38bd400011", - "reference": "8e06808c1423e9208d63d1bd205b9a38bd400011", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/80547a93236fbb9c783e05f0f0899043851b0dba", + "reference": "80547a93236fbb9c783e05f0f0899043851b0dba", "shasum": "" }, "require": { @@ -510,9 +510,9 @@ ], "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v1.4.0" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.5.0" }, - "time": "2025-06-19T12:27:27+00:00" + "time": "2026-05-19T18:30:09+00:00" }, { "name": "nextcloud/ocp", @@ -783,16 +783,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.94.2", + "version": "v3.95.3", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "80fd29f44a736136a2f05bae5464816a444b91d1" + "reference": "681eea341af451ca7cee6abcebc49fcce59507a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/80fd29f44a736136a2f05bae5464816a444b91d1", - "reference": "80fd29f44a736136a2f05bae5464816a444b91d1", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/681eea341af451ca7cee6abcebc49fcce59507a3", + "reference": "681eea341af451ca7cee6abcebc49fcce59507a3", "shasum": "" }, "require": { @@ -829,9 +829,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.94.2" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.95.3" }, - "time": "2026-02-20T16:14:17+00:00" + "time": "2026-05-29T20:36:02+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -2663,16 +2663,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.6.0", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "59eb412e93815df44f05f342958efa9f46b1e586" + "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586", - "reference": "59eb412e93815df44f05f342958efa9f46b1e586", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/ccba7060602b7fed0b03c85bf025257f76d9ef32", + "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32", "shasum": "" }, "require": { @@ -2686,7 +2686,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -2719,7 +2719,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.0" }, "funding": [ { @@ -2730,12 +2730,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2026-01-05T13:30:16+00:00" }, { "name": "theseer/tokenizer", From 125d6069d34d7469abf2f08501411f969184d17f Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 1 Jun 2026 10:01:02 +0200 Subject: [PATCH 2/2] refactor: Run new version of nextcloud/coding-standard Signed-off-by: Carl Schwan --- lib/Command/DeleteProvider.php | 2 -- lib/Controller/Id4meController.php | 1 - lib/Controller/LoginController.php | 1 - lib/Db/SessionMapper.php | 1 - lib/Event/AttributeMappedEvent.php | 1 - lib/Helper/HttpClientHelper.php | 1 - lib/Service/ProviderService.php | 1 - lib/Service/ProvisioningService.php | 1 - lib/Service/SettingsService.php | 1 - tests/integration/Test.php | 1 - tests/stubs/ocp_imapperexception.php | 1 + tests/unit/Db/UserMapperTest.php | 2 -- tests/unit/Service/DiscoveryServiceTest.php | 1 - tests/unit/Service/ProviderServiceTest.php | 1 - tests/unit/Service/ProvisioningServiceTest.php | 1 - 15 files changed, 1 insertion(+), 16 deletions(-) diff --git a/lib/Command/DeleteProvider.php b/lib/Command/DeleteProvider.php index aeb432a3..3ece48df 100644 --- a/lib/Command/DeleteProvider.php +++ b/lib/Command/DeleteProvider.php @@ -11,10 +11,8 @@ use Exception; use OC\Core\Command\Base; use OCA\UserOIDC\Db\ProviderMapper; - use OCA\UserOIDC\Service\ProviderService; use OCP\AppFramework\Db\DoesNotExistException; - use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; diff --git a/lib/Controller/Id4meController.php b/lib/Controller/Id4meController.php index 2c2a3407..8a76c8e5 100644 --- a/lib/Controller/Id4meController.php +++ b/lib/Controller/Id4meController.php @@ -43,7 +43,6 @@ use OCP\IUserSession; use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; - use OCP\Util; use Psr\Log\LoggerInterface; diff --git a/lib/Controller/LoginController.php b/lib/Controller/LoginController.php index 8b864d69..6abda947 100644 --- a/lib/Controller/LoginController.php +++ b/lib/Controller/LoginController.php @@ -327,7 +327,6 @@ public function login(int $providerId, ?string $redirectUrl = null) { $data['code_challenge_method'] = 'S256'; } - $authorizationUrl = $this->discoveryService->buildAuthorizationUrl($discovery['authorization_endpoint'], $data); $this->logger->debug('Redirecting user to: ' . $authorizationUrl); diff --git a/lib/Db/SessionMapper.php b/lib/Db/SessionMapper.php index c7e3c192..95501125 100644 --- a/lib/Db/SessionMapper.php +++ b/lib/Db/SessionMapper.php @@ -14,7 +14,6 @@ use OCP\AppFramework\Db\QBMapper; use OCP\DB\Exception; use OCP\DB\QueryBuilder\IQueryBuilder; - use OCP\IDBConnection; use OCP\Security\ICrypto; diff --git a/lib/Event/AttributeMappedEvent.php b/lib/Event/AttributeMappedEvent.php index 09c8e90d..c39b11a3 100644 --- a/lib/Event/AttributeMappedEvent.php +++ b/lib/Event/AttributeMappedEvent.php @@ -7,7 +7,6 @@ declare(strict_types=1); - namespace OCA\UserOIDC\Event; use OCP\EventDispatcher\Event; diff --git a/lib/Helper/HttpClientHelper.php b/lib/Helper/HttpClientHelper.php index df218815..cf873b39 100644 --- a/lib/Helper/HttpClientHelper.php +++ b/lib/Helper/HttpClientHelper.php @@ -11,7 +11,6 @@ use OCA\UserOIDC\Vendor\Id4me\RP\HttpClient; use OCP\Http\Client\IClientService; - use OCP\IConfig; class HttpClientHelper implements HttpClient { diff --git a/lib/Service/ProviderService.php b/lib/Service/ProviderService.php index 05a2a364..2ffcbf87 100644 --- a/lib/Service/ProviderService.php +++ b/lib/Service/ProviderService.php @@ -7,7 +7,6 @@ declare(strict_types=1); - namespace OCA\UserOIDC\Service; use OCA\UserOIDC\AppInfo\Application; diff --git a/lib/Service/ProvisioningService.php b/lib/Service/ProvisioningService.php index 1a62f943..4014cc19 100644 --- a/lib/Service/ProvisioningService.php +++ b/lib/Service/ProvisioningService.php @@ -787,7 +787,6 @@ public function provisionUserGroups(IUser $user, int $providerId, object $idToke return $syncGroups; } - public function getGroupWhitelistRegex(int $providerId): string { $regex = $this->providerService->getSetting($providerId, ProviderService::SETTING_GROUP_WHITELIST_REGEX, ''); diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php index ffd75d34..053ea0d7 100644 --- a/lib/Service/SettingsService.php +++ b/lib/Service/SettingsService.php @@ -7,7 +7,6 @@ declare(strict_types=1); - namespace OCA\UserOIDC\Service; use OCA\UserOIDC\AppInfo\Application; diff --git a/tests/integration/Test.php b/tests/integration/Test.php index 675ca23b..aa4fe5a0 100644 --- a/tests/integration/Test.php +++ b/tests/integration/Test.php @@ -63,7 +63,6 @@ private function cleanupUser(string $userId): void { } } - public function testAlternativeLogins() { $alternativeLogins = OC_App::getAlternativeLogIns(); self::assertCount(1, $alternativeLogins); diff --git a/tests/stubs/ocp_imapperexception.php b/tests/stubs/ocp_imapperexception.php index 33347f46..4541d506 100644 --- a/tests/stubs/ocp_imapperexception.php +++ b/tests/stubs/ocp_imapperexception.php @@ -7,6 +7,7 @@ // IMapperException didn't extend Throwable until 27 // so we need this to test against stable25 and stable26 + namespace OCP\AppFramework\Db { interface IMapperException extends \Throwable { } diff --git a/tests/unit/Db/UserMapperTest.php b/tests/unit/Db/UserMapperTest.php index c4ecbde8..b7a1abe6 100644 --- a/tests/unit/Db/UserMapperTest.php +++ b/tests/unit/Db/UserMapperTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); - use OCA\UserOIDC\Db\UserMapper; use OCA\UserOIDC\Service\LocalIdService; use OCP\AppFramework\Db\DoesNotExistException; @@ -44,7 +43,6 @@ public function setUp(): void { ->getMock(); } - public static function dataCreate(): array { return [ // unique uid diff --git a/tests/unit/Service/DiscoveryServiceTest.php b/tests/unit/Service/DiscoveryServiceTest.php index 5a17452d..a1d5d8ee 100644 --- a/tests/unit/Service/DiscoveryServiceTest.php +++ b/tests/unit/Service/DiscoveryServiceTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); - use OCA\UserOIDC\Helper\HttpClientHelper; use OCA\UserOIDC\Service\DiscoveryService; use OCA\UserOIDC\Service\ProviderService; diff --git a/tests/unit/Service/ProviderServiceTest.php b/tests/unit/Service/ProviderServiceTest.php index 75919fc8..c1cd39eb 100644 --- a/tests/unit/Service/ProviderServiceTest.php +++ b/tests/unit/Service/ProviderServiceTest.php @@ -7,7 +7,6 @@ declare(strict_types=1); - use OCA\UserOIDC\AppInfo\Application; use OCA\UserOIDC\Db\ProviderMapper; use OCA\UserOIDC\Service\ProviderService; diff --git a/tests/unit/Service/ProvisioningServiceTest.php b/tests/unit/Service/ProvisioningServiceTest.php index 8b8b6cb2..eba8a4f9 100644 --- a/tests/unit/Service/ProvisioningServiceTest.php +++ b/tests/unit/Service/ProvisioningServiceTest.php @@ -290,7 +290,6 @@ public function testProvisionUserInvalidProperties(): void { ->with('twitter') ->willReturn($property); - $this->accountManager->expects(self::once()) ->method('getAccount') ->with($user)