Merge pull request #23 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property
mezzio · Sep 17, 2022 · 175cbfc · 175cbfc
2 parents e2d2be8 + 44e0be2
commit 175cbfc
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 51 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -93,8 +93,8 @@
     <InternalMethod occurrences="1">
       <code>getResponseFactory</code>
     </InternalMethod>
-    <MissingClosureReturnType occurrences="1">
-      <code>function () {</code>
+    <MissingClosureReturnType occurrences="2">
+      <code>fn()</code>
     </MissingClosureReturnType>
     <MixedArgumentTypeCoercion occurrences="2">
       <code>$details</code>
@@ -130,8 +130,7 @@
   </file>
   <file src="test/PhpSessionTest.php">
     <MissingClosureReturnType occurrences="2">
-      <code>function () {</code>
-      <code>function () {</code>
+      <code>fn()</code>
     </MissingClosureReturnType>
     <MixedArgumentTypeCoercion occurrences="12">
       <code>$details</code>

diff --git a/src/PhpSession.php b/src/PhpSession.php
@@ -22,14 +22,11 @@
 
 class PhpSession implements AuthenticationInterface
 {
-    /** @var UserRepositoryInterface */
-    private $repository;
+    private UserRepositoryInterface $repository;
 
-    /** @var array */
-    private $config;
+    private array $config;
 
-    /** @var ResponseFactoryInterface */
-    private $responseFactory;
+    private ResponseFactoryInterface $responseFactory;
 
     /** @var callable */
     private $userFactory;
@@ -49,22 +46,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 = static 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/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -9,8 +9,7 @@
 
 class ConfigProviderTest extends TestCase
 {
-    /** @var ConfigProvider */
-    private $provider;
+    private ConfigProvider $provider;
 
     public function setUp(): void
     {

diff --git a/test/PhpSessionFactoryTest.php b/test/PhpSessionFactoryTest.php
@@ -22,8 +22,7 @@ class PhpSessionFactoryTest extends TestCase
     /** @var ContainerInterface|ObjectProphecy */
     private $container;
 
-    /** @var PhpSessionFactory */
-    private $factory;
+    private PhpSessionFactory $factory;
 
     /** @var UserRepositoryInterface|ObjectProphecy */
     private $userRegister;
@@ -101,11 +100,8 @@ protected function setUp(): void
         $this->factory           = new PhpSessionFactory();
         $this->userRegister      = $this->createMock(UserRepositoryInterface::class);
         $this->responsePrototype = $this->createMock(ResponseInterface::class);
-        $this->responseFactory   = function () {
-            return $this->responsePrototype;
-        };
-        $this->userFactory       = function (string $identity, array $roles = [], array $details = []): UserInterface {
-            return new DefaultUser($identity, $roles, $details);
-        };
+        $this->responseFactory   = fn() => $this->responsePrototype;
+        $this->userFactory       = static fn(string $identity, array $roles = [], array $details = []): UserInterface
+             => new DefaultUser($identity, $roles, $details);
     }
 }
diff --git a/test/PhpSessionTest.php b/test/PhpSessionTest.php
@@ -4,6 +4,7 @@
 
 namespace MezzioTest\Authentication\Session;
 
+use Generator;
 use Mezzio\Authentication\AuthenticationInterface;
 use Mezzio\Authentication\DefaultUser;
 use Mezzio\Authentication\Session\ConfigProvider;
@@ -344,7 +345,7 @@ public function testUnauthorizedResponse(): void
 
     public function testIterableRolesWillBeConvertedToArray(): void
     {
-        $roleGenerator = function () {
+        $roleGenerator = static function (): Generator {
             yield 'captain';
         };
 
@@ -417,12 +418,9 @@ protected function setUp(): void
         $this->userRegister      = $this->createMock(UserRepositoryInterface::class);
         $this->authenticatedUser = $this->createMock(UserInterface::class);
         $this->responsePrototype = $this->createMock(ResponseInterface::class);
-        $this->responseFactory   = function () {
-            return $this->responsePrototype;
-        };
-        $this->userFactory       = function (string $identity, array $roles = [], array $details = []): UserInterface {
-            return new DefaultUser($identity, $roles, $details);
-        };
+        $this->responseFactory   = fn() => $this->responsePrototype;
+        $this->userFactory       = static fn(string $identity, array $roles = [], array $details = []): UserInterface
+            => new DefaultUser($identity, $roles, $details);
         $this->session           = $this->createMock(SessionInterface::class);
         $this->defaultConfig     = (new ConfigProvider())()['authentication'];
     }

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),
                         ],
                     ],
                 ],
@@ -97,9 +93,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/TestAsset/InMemoryContainerPSR11V1.php b/test/TestAsset/InMemoryContainerPSR11V1.php
@@ -13,7 +13,7 @@
 final class InMemoryContainerPSR11V1 implements ContainerInterface
 {
     /** @var array<string,mixed> */
-    private $services = [];
+    private array $services = [];
 
     /**
      * @param string $id

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

diff --git a/test/autoload.php b/test/autoload.php
@@ -6,7 +6,7 @@
 use MezzioTest\Authentication\Session\TestAsset\InMemoryContainerPSR11V2;
 use Psr\Container\ContainerInterface;
 
-(function () {
+(static function () {
     $r      = new ReflectionMethod(ContainerInterface::class, 'has');
     $params = $r->getParameters();
     $id     = array_shift($params);