Bump ecphp/cas-lib to version 3.0

.github/workflows/prettier.yml

@@ -16,7 +16,7 @@ jobs:
               uses: actions/checkout@v3
 
             - name: Install the Nix package manager
-              uses: cachix/install-nix-action@v19
+              uses: cachix/install-nix-action@v20
 
             - name: Checks
               run: nix run nixpkgs#nodePackages.prettier -- --check .

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2019-2023, European Union.
+Copyright (c) 2019-2024, European Union.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

composer.json

@@ -11,12 +11,10 @@
     ],
     "homepage": "https://github.com/ecphp/",
     "require": {
-        "php": ">= 8.0.2",
+        "php": ">= 8.1",
         "ext-dom": "*",
-        "ext-json": "*",
-        "ext-libxml": "*",
         "ext-simplexml": "*",
-        "ecphp/cas-lib": "^2.0",
+        "ecphp/cas-lib": "^3.0",
         "laravel/framework": "^9 || ^10"
     },
     "require-dev": {
@@ -37,9 +35,9 @@
     },
     "config": {
         "allow-plugins": {
-            "phpstan/extension-installer": true,
+            "ergebnis/composer-normalize": true,
             "phpro/grumphp": true,
-            "ergebnis/composer-normalize": true
+            "phpstan/extension-installer": true
         }
     }
 }

src/Auth/CasGuard.php

@@ -27,14 +27,13 @@
 
     public function __construct(
         private ?UserProvider $provider,
         private Request $request,
         private Session $session
-    ) {
-    }
+    ) {}
 
     public function attempt(array $credentials): ?Authenticatable
     {
         $user = $this->provider->retrieveByCredentials($credentials);
 
         if (null === $user) {
             return null;
@@ -50,12 +49,12 @@
         return null !== $this->user();
     }
 
     public function getJsonParams()
     {
         return null;
     }
 
     public function getName()
     {
         return sprintf('login_%s_%s', $this->name, sha1(self::class));
     }
@@ -76,10 +75,10 @@
             return null;
         }
 
         return $this->user->user;
     }
 
     public function logout()
     {
         $this->user = null;
         $this->loggedOut = true;
@@ -101,10 +100,10 @@
             return null;
         }
 
         return $this->provider->retrieveCasUser();
     }
 
     public function validate(array $credentials = [])
     {
         if ([] === $credentials) {
             return false;

src/Auth/CasUserProvider.php

@@ -26,15 +26,14 @@
 
     public function __construct(
         private Session $session
-    ) {
-    }
+    ) {}
 
     public function getModel(): ?Authenticatable
     {
         return $this->model;
     }
 
     public function retrieveByCredentials(array $credentials): ?Authenticatable
     {
         if ([] === $credentials) {
             return null;
@@ -63,9 +62,7 @@
         return $this->session->get(auth()->guard($this->guard_name)->getName());
     }
 
-    public function updateRememberToken(Authenticatable $user, $token)
-    {
-    }
+    public function updateRememberToken(Authenticatable $user, $token) {}
 
     public function validateCredentials(Authenticatable $user, array $credentials)
     {

src/Auth/User/CasUser.php

@@ -75,8 +75,6 @@ public function getAuthIdentifierName(): string
 
     /**
      * Get the password for the user.
-     *
-     * @return string
      */
     public function getAuthPassword(): ?string
     {
@@ -103,8 +101,6 @@ public function getRememberToken(): string
 
     /**
      * Get the column name for the "remember me" token.
-     *
-     * @return string
      */
     public function getRememberTokenName(): ?string
     {
@@ -121,9 +117,7 @@ public function getRoles(): array
      *
      * @param mixed $value
      */
-    public function setRememberToken($value): void
-    {
-    }
+    public function setRememberToken($value): void {}
 
     /**
      * Get the storage.

src/Config/Laravel.php

@@ -15,7 +15,6 @@
 use EcPhp\CasLib\Contract\Configuration\PropertiesInterface;
 use Illuminate\Routing\Router;
 use Illuminate\Routing\Router as RouterInterface;
-use ReturnTypeWillChange;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
@@ -39,46 +38,9 @@ public function __construct(
         );
     }
 
-    public function all(): array
+    public function jsonSerialize(): mixed
     {
-        return $this->cas->all();
-    }
-
-    /**
-     * @param mixed $offset
-     */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset): bool
-    {
-        return $this->cas->offsetExists($offset);
-    }
-
-    /**
-     * @param mixed $offset
-     *
-     * @return array<string, mixed>|mixed
-     */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
-    {
-        return $this->cas->offsetGet($offset);
-    }
-
-    /**
-     * @param mixed $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value): void
-    {
-        $this->cas->offsetSet($offset, $value);
-    }
-
-    /**
-     * @param mixed $offset
-     */
-    public function offsetUnset($offset): void
-    {
-        $this->cas->offsetUnset($offset);
+        return $this->cas->jsonSerialize();
     }
 
     /**

src/Controllers/LoginController.php

@@ -24,7 +24,7 @@ public function __invoke(
         Request $request,
         CasInterface $cas,
         ServerRequestInterface $serverRequest,
-    ): Redirector|ResponseInterface|RedirectResponse {
+    ): Redirector|RedirectResponse|ResponseInterface {
         $parameters = $request->query->all() + [
             'renew' => null !== auth()->guard()->user(),
         ];

src/Controllers/LogoutController.php

@@ -24,7 +24,7 @@ public function __invoke(
         Request $request,
         CasInterface $cas,
         ServerRequestInterface $serverRequest
-    ): RedirectResponse|Redirector|ResponseInterface {
+    ): Redirector|RedirectResponse|ResponseInterface {
         $response = $cas
             ->logout(
                 $serverRequest->withQueryParams(

src/Controllers/ProxyCallbackController.php

@@ -23,7 +23,7 @@ public function __invoke(
         Request $request,
         CasInterface $cas,
         ServerRequestInterface $serverRequest
-    ): ResponseInterface|Response {
+    ): Response|ResponseInterface {
         return $cas
             ->handleProxyCallback(
                 $serverRequest

src/Middleware/CasAuthenticator.php

@@ -22,8 +22,7 @@ final class CasAuthenticator
     public function __construct(
         private CasInterface $cas,
         private ServerRequestInterface $serverRequest
-    ) {
-    }
+    ) {}
 
     public function handle(Request $request, Closure $next): mixed
     {