Merge pull request #21 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property

Author: Ocramius

src/LaminasRouter.php

@@ -37,30 +37,25 @@ class LaminasRouter implements RouterInterface
 
     /**
      * Store the HTTP methods allowed for each path.
-     *
-     * @var array
      */
-    private $allowedMethodsByPath = [];
+    private array $allowedMethodsByPath = [];
 
     /**
      * Map a named route to a Laminas route name to use for URI generation.
-     *
-     * @var array
      */
-    private $routeNameMap = [];
+    private array $routeNameMap = [];
 
     /** @var Route[] */
-    private $routes = [];
+    private array $routes = [];
 
     /**
      * Routes aggregated to inject.
      *
      * @var Route[]
      */
-    private $routesToInject = [];
+    private array $routesToInject = [];
 
-    /** @var TreeRouteStack */
-    private $laminasRouter;
+    private TreeRouteStack $laminasRouter;
 
     /**
      * Lazy instantiates a TreeRouteStack if none is provided.

test/LaminasRouter/ConfigProviderTest.php

@@ -11,8 +11,7 @@
 
 class ConfigProviderTest extends TestCase
 {
-    /** @var ConfigProvider */
-    private $provider;
+    private ConfigProvider $provider;
 
     protected function setUp(): void
     {

test/LaminasRouterTest.php

@@ -32,7 +32,7 @@ class LaminasRouterTest extends TestCase
     /** @var TreeRouteStack|ObjectProphecy */
     private $laminasRouter;
     /** @var Route[] */
-    private $routesToInject;
+    private ?array $routesToInject = null;
 
     protected function setUp(): void
     {
@@ -52,9 +52,7 @@ private function getMiddleware(): MiddlewareInterface
     public function testWillLazyInstantiateALaminasTreeRouteStackIfNoneIsProvidedToConstructor(): void
     {
         $router        = new LaminasRouter();
-        $laminasRouter = Closure::bind(function () {
-            return $this->laminasRouter;
-        }, $router, LaminasRouter::class)();
+        $laminasRouter = Closure::bind(fn() => $this->laminasRouter, $router, LaminasRouter::class)();
         $this->assertInstanceOf(TreeRouteStack::class, $laminasRouter);
     }
 
@@ -85,9 +83,7 @@ public function testAddingRouteAggregatesInRouter(): void
         $router = $this->getRouter();
         $router->addRoute($route);
 
-        $routesToInject = Closure::bind(function () {
-            return $this->routesToInject;
-        }, $router, LaminasRouter::class)();
+        $routesToInject = Closure::bind(fn() => $this->routesToInject, $router, LaminasRouter::class)();
         $this->assertContains($route, $routesToInject);
     }