Merge pull request #19 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property
mezzio · Sep 17, 2022 · fdd7059 · fdd7059
2 parents f2ec3e5 + 13e3b56
commit fdd7059
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -33,8 +33,8 @@
     </UndefinedClass>
   </file>
   <file src="test/AuthorizationMiddlewareFactoryTest.php">
-    <MissingClosureReturnType occurrences="1">
-      <code>function () {</code>
+    <MissingClosureReturnType occurrences="2">
+      <code>fn()</code>
     </MissingClosureReturnType>
     <MissingReturnType occurrences="2">
       <code>testFactory</code>
@@ -76,8 +76,8 @@
       <code>Argument::that([$this-&gt;request, 'reveal'])</code>
       <code>Argument::that([$this-&gt;request, 'reveal'])</code>
     </InvalidArgument>
-    <MissingClosureReturnType occurrences="1">
-      <code>function () {</code>
+    <MissingClosureReturnType occurrences="2">
+      <code>fn()</code>
     </MissingClosureReturnType>
     <MissingReturnType occurrences="4">
       <code>testConstructor</code>

diff --git a/src/AuthorizationMiddleware.php b/src/AuthorizationMiddleware.php
@@ -5,15 +5,15 @@
 namespace Mezzio\Authorization;
 
 use Mezzio\Authentication\UserInterface;
+use Mezzio\Authorization\AuthorizationInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 class AuthorizationMiddleware implements MiddlewareInterface
 {
-    /** @var AuthorizationInterface */
-    private $authorization;
+    private AuthorizationInterface $authorization;
 
     /** @var callable */
     private $responseFactory;
@@ -23,9 +23,7 @@ public function __construct(AuthorizationInterface $authorization, callable $res
         $this->authorization = $authorization;
 
         // Ensures type safety of the composed factory
-        $this->responseFactory = function () use ($responseFactory): ResponseInterface {
-            return $responseFactory();
-        };
+        $this->responseFactory = static fn(): ResponseInterface => $responseFactory();
     }
 
     /**

diff --git a/test/AuthorizationMiddlewareFactoryTest.php b/test/AuthorizationMiddlewareFactoryTest.php
@@ -23,8 +23,7 @@ class AuthorizationMiddlewareFactoryTest extends TestCase
     /** @var ContainerInterface|ObjectProphecy */
     private $container;
 
-    /** @var AuthorizationMiddlewareFactory */
-    private $factory;
+    private AuthorizationMiddlewareFactory $factory;
 
     /** @var AuthorizationInterface|ObjectProphecy */
     private $authorization;
@@ -41,9 +40,7 @@ protected function setUp(): void
         $this->factory           = new AuthorizationMiddlewareFactory();
         $this->authorization     = $this->prophesize(AuthorizationInterface::class);
         $this->responsePrototype = $this->prophesize(ResponseInterface::class);
-        $this->responseFactory   = function () {
-            return $this->responsePrototype->reveal();
-        };
+        $this->responseFactory   = fn() => $this->responsePrototype->reveal();
 
         $this->container
             ->get(AuthorizationInterface::class)

diff --git a/test/AuthorizationMiddlewareTest.php b/test/AuthorizationMiddlewareTest.php
@@ -41,9 +41,7 @@ protected function setUp(): void
         $this->request           = $this->prophesize(ServerRequestInterface::class);
         $this->handler           = $this->prophesize(RequestHandlerInterface::class);
         $this->responsePrototype = $this->prophesize(ResponseInterface::class);
-        $this->responseFactory   = function () {
-            return $this->responsePrototype->reveal();
-        };
+        $this->responseFactory   = fn() => $this->responsePrototype->reveal();
     }
 
     public function testConstructor()

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;
 
     protected function setUp(): void
     {