Merge pull request #43 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property

Author: Ocramius

src/Configuration/RouteConfiguration.php

@@ -7,7 +7,6 @@
 use Mezzio\Cors\Service\CorsMetadata;
 use Webmozart\Assert\Assert;
 
-use function array_merge;
 use function array_unique;
 use function sort;
 
@@ -16,11 +15,9 @@
 
 final class RouteConfiguration extends AbstractConfiguration implements RouteConfigurationInterface
 {
-    /** @var bool */
-    protected $overridesProjectConfiguration = true;
+    private bool $overridesProjectConfiguration = true;
 
-    /** @var bool */
-    protected $explicit = false;
+    private bool $explicit = false;
 
     public function setOverridesProjectConfiguration(bool $overridesProjectConfiguration): void
     {
@@ -65,9 +62,9 @@ public function mergeWithConfiguration(ConfigurationInterface $configuration): R
             $instance->setAllowedMaxAge($configuration->allowedMaxAge());
         }
 
-        $instance->setAllowedHeaders(array_merge($configuration->allowedHeaders(), $instance->allowedHeaders()));
-        $instance->setAllowedOrigins(array_merge($configuration->allowedOrigins(), $instance->allowedOrigins()));
-        $instance->setExposedHeaders(array_merge($configuration->exposedHeaders(), $instance->exposedHeaders()));
+        $instance->setAllowedHeaders([...$configuration->allowedHeaders(), ...$instance->allowedHeaders()]);
+        $instance->setAllowedOrigins([...$configuration->allowedOrigins(), ...$instance->allowedOrigins()]);
+        $instance->setExposedHeaders([...$configuration->exposedHeaders(), ...$instance->exposedHeaders()]);
 
         return $instance->withRequestMethods($configuration->allowedMethods());
     }
@@ -79,7 +76,7 @@ public function mergeWithConfiguration(ConfigurationInterface $configuration): R
      */
     public function withRequestMethods(array $methods): RouteConfigurationInterface
     {
-        $methods = $this->normalizeRequestMethods(array_merge($this->allowedMethods, $methods));
+        $methods = $this->normalizeRequestMethods([...$this->allowedMethods, ...$methods]);
 
         $instance                 = clone $this;
         $instance->allowedMethods = $methods;

src/Middleware/CorsMiddleware.php

@@ -19,14 +19,11 @@
 
 final class CorsMiddleware implements MiddlewareInterface
 {
-    /** @var CorsInterface */
-    private $cors;
+    private CorsInterface $cors;
 
-    /** @var ConfigurationLocatorInterface */
-    private $configurationLocator;
+    private ConfigurationLocatorInterface $configurationLocator;
 
-    /** @var ResponseFactoryInterface */
-    private $responseFactory;
+    private ResponseFactoryInterface $responseFactory;
 
     public function __construct(
         CorsInterface $cors,

src/Service/ConfigurationLocator.php

@@ -19,17 +19,13 @@
 
 final class ConfigurationLocator implements ConfigurationLocatorInterface
 {
-    /** @var ConfigurationInterface */
-    private $configuration;
+    private ConfigurationInterface $configuration;
 
-    /** @var ServerRequestFactoryInterface */
-    private $requestFactory;
+    private ServerRequestFactoryInterface $requestFactory;
 
-    /** @var RouterInterface */
-    private $router;
+    private RouterInterface $router;
 
-    /** @var RouteConfigurationFactoryInterface */
-    private $routeConfigurationFactory;
+    private RouteConfigurationFactoryInterface $routeConfigurationFactory;
 
     public function __construct(
         ConfigurationInterface $configuration,

src/Service/Cors.php

@@ -17,8 +17,7 @@
 
 final class Cors implements CorsInterface
 {
-    /** @var UriFactoryInterface */
-    private $uriFactory;
+    private UriFactoryInterface $uriFactory;
 
     public function __construct(UriFactoryInterface $uriFactory)
     {

src/Service/ResponseFactory.php

@@ -13,8 +13,7 @@
 
 final class ResponseFactory implements ResponseFactoryInterface
 {
-    /** @var PsrResponseFactoryInterface */
-    private $responseFactory;
+    private PsrResponseFactoryInterface $responseFactory;
 
     public function __construct(PsrResponseFactoryInterface $responseFactory)
     {

test/Configuration/RouteConfigurationFactoryTest.php

@@ -10,10 +10,7 @@
 
 final class RouteConfigurationFactoryTest extends TestCase
 {
-    /**
-     * @var RouteConfigurationFactory
-     */
-    private $factory;
+    private RouteConfigurationFactory $factory;
 
     protected function setUp(): void
     {

test/Middleware/CorsMiddlewareTest.php

@@ -32,8 +32,7 @@ final class CorsMiddlewareTest extends TestCase
     /** @psalm-var ResponseFactoryInterface&MockObject */
     private $responseFactoryInterface;
 
-    /** @var CorsMiddleware */
-    private $middleware;
+    private CorsMiddleware $middleware;
 
     /**
      * @psalm-return array<non-empty-string,array{0:non-empty-string}>

test/Service/ConfigurationLocatorTest.php

@@ -20,37 +20,31 @@
 
 use function array_diff;
 use function array_fill;
-use function array_merge;
 use function count;
 
 final class ConfigurationLocatorTest extends TestCase
 {
-    /** @var ConfigurationLocator */
-    private $locator;
+    private ConfigurationLocator $locator;
 
     /**
-     * @var MockObject
-     * @psalm-var ConfigurationInterface&MockObject
+     * @psalm-var MockObject&ConfigurationInterface
      */
-    private $projectConfiguration;
+    private ConfigurationInterface $projectConfiguration;
 
     /**
-     * @var MockObject
      * @psalm-var MockObject&ServerRequestFactoryInterface
      */
-    private $requestFactory;
+    private ServerRequestFactoryInterface $requestFactory;
 
     /**
-     * @var MockObject
      * @psalm-var MockObject&RouterInterface
      */
-    private $router;
+    private RouterInterface $router;
 
     /**
-     * @var MockObject
-     * @psalm-var RouteConfigurationFactoryInterface&MockObject
+     * @psalm-var MockObject&RouteConfigurationFactoryInterface
      */
-    private $routeConfigurationFactory;
+    private RouteConfigurationFactoryInterface $routeConfigurationFactory;
 
     public function testWontLocateAnyConfigurationIfRouteIsUnknown(): void
     {
@@ -334,7 +328,7 @@ private function createServerRequestArguments(string $initialRequestMethod, UriI
             $consecutiveArguments[] = [$requestMethod, $requestUri];
         }
 
-        return array_merge([$initialArgument], $consecutiveArguments);
+        return [...[$initialArgument], ...$consecutiveArguments];
     }
 
     public function testWillEarlyReturnExplicitRouteConfiguration(): void

test/Service/CorsTest.php

@@ -23,10 +23,7 @@ final class CorsTest extends TestCase
      */
     private $uriFactory;
 
-    /**
-     * @var Cors
-     */
-    private $cors;
+    private Cors $cors;
 
     /**
      * @dataProvider crossOriginProvider

test/Service/ResponseFactoryTest.php

@@ -15,16 +15,12 @@
 
 final class ResponseFactoryTest extends TestCase
 {
-    /**
-     * @var ResponseFactory
-     */
-    private $responseFactory;
+    private ResponseFactory $responseFactory;
 
     /**
-     * @var MockObject
      * @psalm-var MockObject&ResponseFactoryInterface
      */
-    private $psrResponseFactory;
+    private MockObject $psrResponseFactory;
 
     protected function setUp(): void
     {