chore: bumped

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.3', '8.4']
+                php-version: ['8.2', '8.3']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2025 Ambroise Maupate
+Copyright © 2024 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

composer.json

@@ -13,22 +13,22 @@
     ],
     "prefer-stable": true,
     "require": {
-        "php": ">=8.3",
+        "php": ">=8.2",
         "ext-json": "*",
         "codercat/jwk-to-pem": "^1.0",
         "lcobucci/jwt": "^5.3",
         "lcobucci/clock": "^3.0",
         "psr/cache": ">=1.0.1",
-        "roadiz/jwt": "2.6.*",
-        "roadiz/models": "2.6.*",
-        "roadiz/random": "2.6.*",
+        "roadiz/jwt": "2.5.*",
+        "roadiz/models": "2.5.*",
+        "roadiz/random": "2.5.*",
         "symfony/event-dispatcher-contracts": "^3.5.1",
-        "symfony/http-client": "7.3.*",
-        "symfony/http-foundation": "7.3.*",
-        "symfony/routing": "7.3.*",
-        "symfony/security-core": "7.3.*",
-        "symfony/security-csrf": "7.3.*",
-        "symfony/security-http": "7.3.*"
+        "symfony/http-client": "6.4.*",
+        "symfony/http-foundation": "6.4.*",
+        "symfony/routing": "6.4.*",
+        "symfony/security-core": "6.4.*",
+        "symfony/security-csrf": "6.4.*",
+        "symfony/security-http": "6.4.*"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.5.3",
@@ -46,8 +46,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.6.x-dev",
-            "dev-develop": "2.7.x-dev"
+            "dev-main": "2.5.x-dev",
+            "dev-develop": "2.6.x-dev"
         }
     }
 }

src/Authentication/OpenIdAuthenticator.php

@@ -60,7 +60,6 @@ public function __construct(
         ]);
     }
 
-    #[\Override]
     public function supports(Request $request): ?bool
     {
         return null !== $this->discovery
@@ -70,7 +69,6 @@ public function supports(Request $request): ?bool
             && ($request->query->has('code') || $request->query->has('error'));
     }
 
-    #[\Override]
     public function authenticate(Request $request): Passport
     {
         if (
@@ -203,13 +201,14 @@ function (Plain $jwt) {
             );
         }
         $passport = new Passport(
-            new UserBadge($username, fn () =>
+            new UserBadge($username, function () use ($jwt, $username) {
                 /*
                  * Load user from Identity provider, create a virtual user
                  * with roles configured in config/packages/roadiz_rozier.yaml
                  * and need to validate JWT token.
                  */
-                $this->loadUser($jwt->claims()->all(), $username, $jwt)),
+                return $this->loadUser($jwt->claims()->all(), $username, $jwt);
+            }),
             $customCredentials
         );
         $passport->setAttribute('jwt', $jwt);
@@ -232,7 +231,6 @@ protected function loadUser(array $payload, string $identity, Plain $jwt): UserI
         );
     }
 
-    #[\Override]
     public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
     {
         if ($targetPath = $this->getTargetPath($request->getSession(), $firewallName)) {
@@ -242,7 +240,6 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
         return new RedirectResponse($this->urlGenerator->generate($this->defaultRoute));
     }
 
-    #[\Override]
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
     {
         if ($request->hasSession()) {

src/Authentication/Provider/ChainJwtRoleStrategy.php

@@ -18,7 +18,6 @@ public function __construct(private array $strategies)
         }
     }
 
-    #[\Override]
     public function supports(): bool
     {
         foreach ($this->strategies as $strategy) {
@@ -30,7 +29,6 @@ public function supports(): bool
         return false;
     }
 
-    #[\Override]
     public function getRoles(): ?array
     {
         $roles = [];

src/Authentication/Provider/OpenIdAccountProvider.php

@@ -20,13 +20,11 @@ public function loadUserByUsername(string $username): UserInterface
         throw new UserNotFoundException('Cannot load an OpenId account with its email.');
     }
 
-    #[\Override]
     public function loadUserByIdentifier(string $identifier): UserInterface
     {
         throw new UserNotFoundException('Cannot load an OpenId account with its email.');
     }
 
-    #[\Override]
     public function refreshUser(UserInterface $user): UserInterface
     {
         if ($user instanceof OpenIdAccount) {
@@ -43,7 +41,6 @@ public function refreshUser(UserInterface $user): UserInterface
     /**
      * @param class-string $class
      */
-    #[\Override]
     public function supportsClass(string $class): bool
     {
         return OpenIdAccount::class === $class;

src/Authentication/Provider/SettingsRoleStrategy.php

@@ -15,20 +15,20 @@ public function __construct(
     ) {
     }
 
-    #[\Override]
     public function supports(): bool
     {
         return !empty($this->settingsBag->get(static::SETTING_NAME));
     }
 
-    #[\Override]
     public function getRoles(): ?array
     {
         $settings = $this->settingsBag->get(static::SETTING_NAME);
         if (!is_string($settings)) {
             return null;
         }
 
-        return array_map(fn ($role) => trim((string) $role), explode(',', $settings));
+        return array_map(function ($role) {
+            return trim($role);
+        }, explode(',', $settings));
     }
 }

src/Discovery.php

@@ -40,7 +40,6 @@ public function isValid(): bool
         return !empty($this->discoveryUri) && filter_var($this->discoveryUri, FILTER_VALIDATE_URL);
     }
 
-    #[\Override]
     protected function populateParameters(): void
     {
         $cacheItem = $this->cacheAdapter->getItem(static::CACHE_KEY);
@@ -57,7 +56,11 @@ protected function populateParameters(): void
                 $parameters = \json_decode(json: $response->getContent(), associative: true, flags: JSON_THROW_ON_ERROR);
                 $cacheItem->set($parameters);
                 $this->cacheAdapter->save($cacheItem);
-            } catch (ExceptionInterface|\JsonException $exception) {
+            } catch (ExceptionInterface $exception) {
+                $this->logger->warning('Cannot fetch OpenID discovery parameters: '.$exception->getMessage());
+
+                return;
+            } catch (\JsonException $exception) {
                 $this->logger->warning('Cannot fetch OpenID discovery parameters: '.$exception->getMessage());
 
                 return;

src/Exception/OpenIdAuthenticationException.php

@@ -11,7 +11,6 @@ final class OpenIdAuthenticationException extends AuthenticationException
     /**
      * Message key to be used by the translation component.
      */
-    #[\Override]
     public function getMessageKey(): string
     {
         return 'An OpenID authentication exception occurred.';

src/OAuth2LinkGenerator.php

@@ -12,7 +12,7 @@
 class OAuth2LinkGenerator
 {
     public const OAUTH_STATE_TOKEN = 'openid_state';
-    private readonly array $openIdScopes;
+    private array $openIdScopes;
 
     public function __construct(
         protected readonly ?Discovery $discovery,