Merge pull request #54 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property
mezzio · Sep 17, 2022 · bf79105 · bf79105
2 parents 9291d0f + c06922c
commit bf79105
Show file tree

Hide file tree

Showing 26 changed files with 68 additions and 129 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -848,8 +848,7 @@
   </file>
   <file src="test/OAuth2AdapterFactoryTest.php">
     <MissingClosureReturnType occurrences="2">
-      <code>function (</code>
-      <code>function () {</code>
+      <code>fn()</code>
     </MissingClosureReturnType>
     <MissingReturnType occurrences="5">
       <code>testConstructor</code>
@@ -892,6 +891,11 @@
       <code>reveal</code>
       <code>reveal</code>
     </PossiblyUndefinedMethod>
+    <UnusedClosureParam occurrences="3">
+      <code>$identity</code>
+      <code>$roles</code>
+      <code>$details</code>
+    </UnusedClosureParam>
   </file>
   <file src="test/OAuth2AdapterTest.php">
     <InvalidArgument occurrences="4">

diff --git a/src/AuthorizationHandler.php b/src/AuthorizationHandler.php
@@ -25,11 +25,9 @@
  */
 class AuthorizationHandler implements RequestHandlerInterface
 {
-    /** @var AuthorizationServer */
-    private $server;
+    private AuthorizationServer $server;
 
-    /** @var ResponseFactoryInterface */
-    private $responseFactory;
+    private ResponseFactoryInterface $responseFactory;
 
     /**
      * @param (callable():ResponseInterface)|ResponseFactoryInterface $responseFactory
@@ -39,9 +37,7 @@ public function __construct(AuthorizationServer $server, $responseFactory)
         $this->server = $server;
         if (is_callable($responseFactory)) {
             $responseFactory = new CallableResponseFactoryDecorator(
-                static function () use ($responseFactory): ResponseInterface {
-                    return $responseFactory();
-                }
+                static fn(): ResponseInterface => $responseFactory()
             );
         }
 

diff --git a/src/AuthorizationMiddleware.php b/src/AuthorizationMiddleware.php
@@ -47,9 +47,7 @@ public function __construct(AuthorizationServer $server, $responseFactory)
         $this->server = $server;
         if (is_callable($responseFactory)) {
             $responseFactory = new CallableResponseFactoryDecorator(
-                static function () use ($responseFactory): ResponseInterface {
-                    return $responseFactory();
-                }
+                static fn(): ResponseInterface => $responseFactory()
             );
         }
 

diff --git a/src/OAuth2Adapter.php b/src/OAuth2Adapter.php
@@ -38,20 +38,13 @@ public function __construct(
 
         if (is_callable($responseFactory)) {
             $responseFactory = new CallableResponseFactoryDecorator(
-                static function () use ($responseFactory): ResponseInterface {
-                    return $responseFactory();
-                }
+                static fn(): ResponseInterface => $responseFactory()
             );
         }
 
         $this->responseFactory = $responseFactory;
-        $this->userFactory     = function (
-            string $identity,
-            array $roles = [],
-            array $details = []
-        ) use ($userFactory): UserInterface {
-            return $userFactory($identity, $roles, $details);
-        };
+        $this->userFactory     = static fn(string $identity, array $roles = [], array $details = []): UserInterface
+                => $userFactory($identity, $roles, $details);
     }
 
     /**

diff --git a/src/Repository/Pdo/AbstractRepository.php b/src/Repository/Pdo/AbstractRepository.php
@@ -35,8 +35,6 @@ protected function scopesToString(array $scopes): string
             return '';
         }
 
-        return trim(array_reduce($scopes, function ($result, $item) {
-            return $result . ' ' . $item->getIdentifier();
-        }));
+        return trim(array_reduce($scopes, static fn($result, $item): string => $result . ' ' . $item->getIdentifier()));
     }
 }
diff --git a/src/TokenEndpointHandler.php b/src/TokenEndpointHandler.php
@@ -40,9 +40,7 @@ public function __construct(AuthorizationServer $server, $responseFactory)
         $this->server = $server;
         if (is_callable($responseFactory)) {
             $responseFactory = new CallableResponseFactoryDecorator(
-                static function () use ($responseFactory): ResponseInterface {
-                    return $responseFactory();
-                }
+                static fn(): ResponseInterface => $responseFactory()
             );
         }
         $this->responseFactory = $responseFactory;

diff --git a/test/AuthorizationHandlerFactoryTest.php b/test/AuthorizationHandlerFactoryTest.php
@@ -58,7 +58,7 @@ public function testRaisesTypeErrorForInvalidAuthorizationServer()
             ->willReturn(new stdClass());
         $this->container
             ->get(ResponseInterface::class)
-            ->willReturn(function () {
+            ->willReturn(static function (): void {
             });
 
         $factory = new AuthorizationHandlerFactory();
@@ -104,9 +104,7 @@ public function testFactoryReturnsInstanceWhenAppropriateDependenciesArePresentI
             ->willReturn($this->authServer->reveal());
         $this->container
             ->get(ResponseInterface::class)
-            ->willReturn(function () {
-                return $this->response;
-            })->shouldBeCalled();
+            ->willReturn(fn(): MockObject => $this->response)->shouldBeCalled();
 
         $factory = new AuthorizationHandlerFactory();
         $factory($this->container->reveal());
@@ -115,9 +113,7 @@ public function testFactoryReturnsInstanceWhenAppropriateDependenciesArePresentI
     public function testConfigProvider()
     {
         $authServer      = $this->prophesize(AuthorizationServer::class)->reveal();
-        $responseFactory = function () {
-            return $this->prophesize(ResponseInterface::class)->reveal();
-        };
+        $responseFactory = fn(): object => $this->prophesize(ResponseInterface::class)->reveal();
 
         $container = new ServiceManager((new ConfigProvider())->getDependencies());
         $container->setService(AuthorizationServer::class, $authServer);

diff --git a/test/AuthorizationHandlerTest.php b/test/AuthorizationHandlerTest.php
@@ -39,9 +39,7 @@ public function testHandleUsesAuthorizationServerService(): void
             ->shouldBeCalled()
             ->willReturn($expectedResponse);
 
-        $subject = new AuthorizationHandler($server->reveal(), function () use ($expectedResponse): ResponseInterface {
-            return $expectedResponse;
-        });
+        $subject = new AuthorizationHandler($server->reveal(), static fn(): ResponseInterface => $expectedResponse);
 
         self::assertSame($expectedResponse, $subject->handle($request->reveal()));
     }
@@ -58,9 +56,7 @@ public function testInvalidResponseFactoryThrowsTypeError()
         $server->completeAuthorizationRequest(Argument::any())
             ->shouldNotBeCalled();
 
-        $subject = new AuthorizationHandler($server->reveal(), function () {
-            return new stdClass();
-        });
+        $subject = new AuthorizationHandler($server->reveal(), static fn(): stdClass => new stdClass());
 
         $this->expectException(TypeError::class);
         $subject->handle($request->reveal());

diff --git a/test/AuthorizationMiddlewareFactoryTest.php b/test/AuthorizationMiddlewareFactoryTest.php
@@ -55,7 +55,7 @@ public function testRaisesTypeErrorForInvalidAuthorizationServer()
             ->willReturn(new stdClass());
         $this->container
             ->get(ResponseInterface::class)
-            ->willReturn(function () {
+            ->willReturn(static function (): void {
             });
 
         $factory = new AuthorizationMiddlewareFactory();
@@ -101,9 +101,7 @@ public function testFactoryReturnsInstanceWhenAppropriateDependenciesArePresentI
             ->willReturn($this->authServer->reveal());
         $this->container
             ->get(ResponseInterface::class)
-            ->willReturn(function () {
-                return $this->response;
-            })
+            ->willReturn(fn(): MockObject => $this->response)
             ->shouldBeCalled();
 
         $factory = new AuthorizationMiddlewareFactory();

diff --git a/test/AuthorizationMiddlewareTest.php b/test/AuthorizationMiddlewareTest.php
@@ -49,9 +49,7 @@ protected function setUp(): void
         $this->serverRequest   = $this->prophesize(ServerRequestInterface::class);
         $this->authRequest     = $this->prophesize(AuthorizationRequest::class);
         $this->handler         = $this->prophesize(RequestHandlerInterface::class);
-        $this->responseFactory = function () {
-            return $this->response;
-        };
+        $this->responseFactory = fn(): MockObject => $this->response;
     }
 
     public function testConstructor()

diff --git a/test/AuthorizationServerFactoryTest.php b/test/AuthorizationServerFactoryTest.php
@@ -128,7 +128,7 @@ public function testInvokeWithListenerConfig()
                 'event_listeners'     => [
                     [
                         RequestEvent::CLIENT_AUTHENTICATION_FAILED,
-                        function (RequestEvent $event) {
+                        static function (RequestEvent $event): void {
                             // do something
                         },
                     ],

diff --git a/test/Entity/UserEntityTest.php b/test/Entity/UserEntityTest.php
@@ -11,8 +11,7 @@
 
 class UserEntityTest extends TestCase
 {
-    /** @var UserEntity */
-    private $entity;
+    private UserEntity $entity;
 
     protected function setUp(): void
     {

diff --git a/test/InMemoryContainer.php b/test/InMemoryContainer.php
@@ -13,7 +13,7 @@
 final class InMemoryContainer implements ContainerInterface
 {
     /** @var array<string,mixed> */
-    private $services = [];
+    private array $services = [];
 
     /**
      * @param string $id

diff --git a/test/OAuth2AdapterFactoryTest.php b/test/OAuth2AdapterFactoryTest.php
@@ -52,17 +52,9 @@ protected function setUp(): void
         $this->resourceServer = $this->prophesize(ResourceServer::class);
         $this->response       = $this->createMock(ResponseInterface::class);
 
-        $this->responseFactory = function () {
-            return $this->response;
-        };
+        $this->responseFactory = fn(): MockObject => $this->response;
         $this->user            = $this->prophesize(UserInterface::class);
-        $this->userFactory     = function (
-            string $identity,
-            array $roles = [],
-            array $details = []
-        ) {
-            return $this->user->reveal($identity, $roles, $details);
-        };
+        $this->userFactory     = fn(string $identity, array $roles = [], array $details = []) => $this->user->reveal();
     }
 
     public function testConstructor()

diff --git a/test/OAuth2AdapterTest.php b/test/OAuth2AdapterTest.php
@@ -38,16 +38,9 @@ protected function setUp(): void
     {
         $this->resourceServer  = $this->prophesize(ResourceServer::class);
         $this->response        = $this->createMock(ResponseInterface::class);
-        $this->responseFactory = function (): ResponseInterface {
-            return $this->response;
-        };
-        $this->userFactory     = function (
-            string $identity,
-            array $roles = [],
-            array $details = []
-        ) {
-            return new DefaultUser($identity, $roles, $details);
-        };
+        $this->responseFactory = fn(): ResponseInterface => $this->response;
+        $this->userFactory     = static fn(string $identity, array $roles = [], array $details = []): DefaultUser
+                => new DefaultUser($identity, $roles, $details);
     }
 
     public function testConstructor()

diff --git a/test/Pdo/OAuth2PdoMiddlewareTest.php b/test/Pdo/OAuth2PdoMiddlewareTest.php
@@ -70,38 +70,29 @@ class OAuth2PdoMiddlewareTest extends TestCase
 
     private const CODE_VERIFIER = 'dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk';
 
-    /** @var AccessTokenRepository */
-    private $accessTokenRepository;
+    private AccessTokenRepository $accessTokenRepository;
 
-    /** @var AuthCodeRepository */
-    private $authCodeRepository;
+    private AuthCodeRepository $authCodeRepository;
 
-    /** @var AuthorizationServer */
-    private $authServer;
+    private AuthorizationServer $authServer;
 
-    /** @var ClientRepository */
-    private $clientRepository;
+    private ClientRepository $clientRepository;
 
     /** @var RequestHandlerInterface|ObjectProphecy */
     private $handler;
 
-    /** @var PdoService */
-    private $pdoService;
+    private PdoService $pdoService;
 
-    /** @var RefreshTokenRepository */
-    private $refreshTokenRepository;
+    private RefreshTokenRepository $refreshTokenRepository;
 
-    /** @var Response */
-    private $response;
+    private Response $response;
 
     /** @var callable */
     private $responseFactory;
 
-    /** @var ScopeRepository */
-    private $scopeRepository;
+    private ScopeRepository $scopeRepository;
 
-    /** @var UserRepository */
-    private $userRepository;
+    private UserRepository $userRepository;
 
     public static function setUpBeforeClass(): void
     {
@@ -151,9 +142,7 @@ protected function setUp(): void
         );
 
         $this->handler         = $this->prophesize(RequestHandlerInterface::class);
-        $this->responseFactory = function () {
-            return $this->response;
-        };
+        $this->responseFactory = fn(): Response => $this->response;
     }
 
     /**
@@ -511,8 +500,7 @@ private function buildConsumerAuthMiddleware(AuthorizationHandler $authHandler):
     {
         return new class ($authHandler) implements RequestHandlerInterface
         {
-            /** @var AuthorizationHandler */
-            private $handler;
+            private AuthorizationHandler $handler;
 
             public function __construct(AuthorizationHandler $handler)
             {

diff --git a/test/Psr17ResponseFactoryTraitTest.php b/test/Psr17ResponseFactoryTraitTest.php
@@ -14,8 +14,7 @@
 
 final class Psr17ResponseFactoryTraitTest extends TestCase
 {
-    /** @var Psr17ResponseFactoryTraitImplementation */
-    private $factory;
+    private Psr17ResponseFactoryTraitImplementation $factory;
 
     protected function setUp(): void
     {
@@ -32,9 +31,8 @@ public function configurationsWithOverriddenResponseInterfaceFactory(): Generato
             [
                 'dependencies' => [
                     'factories' => [
-                        ResponseInterface::class => function (): ResponseInterface {
-                            return $this->createMock(ResponseInterface::class);
-                        },
+                        ResponseInterface::class
+                            => fn(): ResponseInterface => $this->createMock(ResponseInterface::class),
                     ],
                 ],
             ],
@@ -55,9 +53,7 @@ public function configurationsWithOverriddenResponseInterfaceFactory(): Generato
                 'dependencies' => [
                     'delegators' => [
                         ResponseInterface::class => [
-                            function (): ResponseInterface {
-                                return $this->createMock(ResponseInterface::class);
-                            },
+                            fn(): ResponseInterface => $this->createMock(ResponseInterface::class),
                         ],
                     ],
                 ],
@@ -93,9 +89,7 @@ public function testWontUseResponseFactoryInterfaceFromContainerWhenApplicationF
         $container->set('config', $config);
         $container->set(ResponseFactoryInterface::class, $responseFactory);
         $response = $this->createMock(ResponseInterface::class);
-        $container->set(ResponseInterface::class, function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $container->set(ResponseInterface::class, static fn(): ResponseInterface => $response);
 
         $detectedResponseFactory = ($this->factory)($container);
         self::assertNotSame($responseFactory, $detectedResponseFactory);

diff --git a/test/Repository/Pdo/AccessTokenRepositoryFactoryTest.php b/test/Repository/Pdo/AccessTokenRepositoryFactoryTest.php
@@ -9,14 +9,14 @@
 use Mezzio\Authentication\OAuth2\Repository\Pdo\PdoService;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 
 class AccessTokenRepositoryFactoryTest extends TestCase
 {
     use ProphecyTrait;
 
-    /** @var ContainerInterface */
-    private $container;
+    private ObjectProphecy $container;
 
     protected function setUp(): void
     {

diff --git a/test/Repository/Pdo/AccessTokenRepositoryTest.php b/test/Repository/Pdo/AccessTokenRepositoryTest.php
@@ -25,8 +25,7 @@ class AccessTokenRepositoryTest extends TestCase
 {
     use ProphecyTrait;
 
-    /** @var AccessTokenRepository */
-    private $repo;
+    private AccessTokenRepository $repo;
 
     protected function setUp(): void
     {