Merge pull request #78 from samsonasik/update-to-use-php81-syntax

Update to use PHP 8.1 syntax

Author: gsteel

src/AuthorizationHandler.php

@@ -25,16 +25,13 @@
  */
 class AuthorizationHandler implements RequestHandlerInterface
 {
-    private AuthorizationServer $server;
-
-    private ResponseFactoryInterface $responseFactory;
+    private readonly ResponseFactoryInterface $responseFactory;
 
     /**
      * @param (callable():ResponseInterface)|ResponseFactoryInterface $responseFactory
      */
-    public function __construct(AuthorizationServer $server, $responseFactory)
+    public function __construct(private readonly AuthorizationServer $server, $responseFactory)
     {
-        $this->server = $server;
         if (is_callable($responseFactory)) {
             $responseFactory = new CallableResponseFactoryDecorator(
                 static fn(): ResponseInterface => $responseFactory()

src/OAuth2Adapter.php

@@ -68,7 +68,7 @@ public function authenticate(ServerRequestInterface $request): ?UserInterface
                     ]
                 );
             }
-        } catch (OAuthServerException $exception) {
+        } catch (OAuthServerException) {
             return null;
         }
         return null;

src/Repository/Pdo/ClientRepository.php

@@ -60,16 +60,12 @@ public function validateClient($clientIdentifier, $clientSecret, $grantType): bo
      */
     protected function isGranted(array $row, ?string $grantType = null): bool
     {
-        switch ($grantType) {
-            case 'authorization_code':
-                return ! ($row['personal_access_client'] || $row['password_client']);
-            case 'personal_access':
-                return (bool) $row['personal_access_client'];
-            case 'password':
-                return (bool) $row['password_client'];
-            default:
-                return true;
-        }
+        return match ($grantType) {
+            'authorization_code' => ! ($row['personal_access_client'] || $row['password_client']),
+            'personal_access' => (bool) $row['personal_access_client'],
+            'password' => (bool) $row['password_client'],
+            default => true,
+        };
     }
 
     private function getClientData(string $clientIdentifier): ?array

test/Pdo/OAuth2PdoMiddlewareTest.php

@@ -492,11 +492,8 @@ private function buildConsumerAuthMiddleware(AuthorizationHandler $authHandler):
     {
         return new class ($authHandler) implements RequestHandlerInterface
         {
-            private AuthorizationHandler $handler;
-
-            public function __construct(AuthorizationHandler $handler)
+            public function __construct(private readonly AuthorizationHandler $handler)
             {
-                $this->handler = $handler;
             }
 
             public function handle(