Merge pull request #21 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property
mezzio · Sep 20, 2022 · 6536e85 · 6536e85
2 parents dee1834 + 0118b89
commit 6536e85
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/src/LaminasAuthentication.php b/src/LaminasAuthentication.php
@@ -44,22 +44,15 @@ public function __construct(
         if (is_callable($responseFactory)) {
             // Ensures type safety of the composed factory
             $responseFactory = new CallableResponseFactoryDecorator(
-                static function () use ($responseFactory): ResponseInterface {
-                    return $responseFactory();
-                }
+                static fn(): ResponseInterface => $responseFactory()
             );
         }
 
         $this->responseFactory = $responseFactory;
 
         // Ensures type safety of the composed factory
-        $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);
     }
 
     public function authenticate(ServerRequestInterface $request): ?UserInterface

diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -10,8 +10,7 @@
 
 class ConfigProviderTest extends TestCase
 {
-    /** @var ConfigProvider */
-    private $provider;
+    private ConfigProvider $provider;
 
     public function setUp(): void
     {

diff --git a/test/LaminasAuthenticationFactoryTest.php b/test/LaminasAuthenticationFactoryTest.php
@@ -38,13 +38,9 @@ public function setUp(): void
     {
         $this->authService       = $this->createMock(AuthenticationService::class);
         $this->responsePrototype = $this->createMock(ResponseInterface::class);
-        $this->responseFactory   = function (): ResponseInterface {
-            return $this->responsePrototype;
-        };
+        $this->responseFactory   = fn(): ResponseInterface => $this->responsePrototype;
         $this->userPrototype     = $this->createMock(UserInterface::class);
-        $this->userFactory       = function (): UserInterface {
-            return $this->userPrototype;
-        };
+        $this->userFactory       = fn(): UserInterface => $this->userPrototype;
     }
 
     public function testInvokeWithEmptyContainer(): void

diff --git a/test/LaminasAuthenticationTest.php b/test/LaminasAuthenticationTest.php
@@ -36,13 +36,9 @@ public function setUp(): void
     {
         $this->request         = $this->createMock(ServerRequestInterface::class);
         $this->authService     = $this->createMock(AuthenticationService::class);
-        $this->responseFactory = function (): ResponseInterface {
-            return $this->createMock(ResponseInterface::class);
-        };
+        $this->responseFactory = fn(): ResponseInterface => $this->createMock(ResponseInterface::class);
         $this->userPrototype   = $this->createMock(UserInterface::class);
-        $this->userFactory     = function (): UserInterface {
-            return $this->userPrototype;
-        };
+        $this->userFactory     = fn(): UserInterface => $this->userPrototype;
     }
 
     public function testConstructor(): void