drop php 7.3 support

samsonasik · Dec 10, 2021 · b1e7ea0 · b1e7ea0
1 parent 052b84f
commit b1e7ea0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 29 deletions.
diff --git a/rector.php b/rector.php
@@ -10,7 +10,7 @@
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
+    $containerConfigurator->import(LevelSetList::UP_TO_PHP_74);
     $containerConfigurator->import(SetList::CODE_QUALITY);
     $containerConfigurator->import(SetList::NAMING);
     $containerConfigurator->import(SetList::TYPE_DECLARATION);
@@ -20,7 +20,6 @@
     $parameters->set(Option::PATHS, [__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/spec']);
 
     $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
 
     $parameters->set(Option::SKIP, [
         AbsolutizeRequireAndIncludePathRector::class,

diff --git a/spec/Listener/ForceHttpsFactorySpec.php b/spec/Listener/ForceHttpsFactorySpec.php
@@ -15,9 +15,7 @@
 
     describe('->__invoke', function () {
 
-        given('container', function (): object {
-            return Double::instance(['implements' => ContainerInterface::class]);
-        });
+        given('container', fn(): object => Double::instance(['implements' => ContainerInterface::class]));
 
         it('returns ' . ForceHttps::class . ' instance with default config', function (): void {
 

diff --git a/spec/Middleware/ForceHttpsFactorySpec.php b/spec/Middleware/ForceHttpsFactorySpec.php
@@ -16,13 +16,9 @@
 
     describe('->__invoke', function () {
 
-        given('container', function (): object {
-            return Double::instance(['implements' => ContainerInterface::class]);
-        });
+        given('container', fn(): object => Double::instance(['implements' => ContainerInterface::class]));
 
-        given('router', function (): object {
-            return Double::instance(['implements' => RouterInterface::class]);
-        });
+        given('router', fn(): object => Double::instance(['implements' => RouterInterface::class]));
 
         it('returns ' . ForceHttps::class . ' instance with default config', function (): void {
 

diff --git a/spec/Middleware/ForceHttpsSpec.php b/spec/Middleware/ForceHttpsSpec.php
@@ -17,21 +17,13 @@
 
     describe('->invoke()', function () {
 
-        given('response', function (): object {
-            return Double::instance(['implements' => ResponseInterface::class]);
-        });
+        given('response', fn(): object => Double::instance(['implements' => ResponseInterface::class]));
 
-        given('request', function (): object {
-            return Double::instance(['implements' => ServerRequestInterface::class]);
-        });
+        given('request', fn(): object => Double::instance(['implements' => ServerRequestInterface::class]));
 
-        given('uri', function (): object {
-            return Double::instance(['implements' => UriInterface::class]);
-        });
+        given('uri', fn(): object => Double::instance(['implements' => UriInterface::class]));
 
-        given('router', function (): object {
-            return Double::instance(['implements'  => RouterInterface::class]);
-        });
+        given('router', fn(): object => Double::instance(['implements'  => RouterInterface::class]));
 
         it('not redirect on not-enable', function (): void {
 

diff --git a/src/Listener/ForceHttps.php b/src/Listener/ForceHttps.php
@@ -83,8 +83,7 @@ public function forceHttpsScheme(MvcEvent $mvcEvent): void
             }
         }
 
-        $httpsRequestUri = $httpsRequestUri
-            ?? $this->getFinalhttpsRequestUri((string) $http->setScheme('https'));
+        $httpsRequestUri ??= $this->getFinalhttpsRequestUri((string) $http->setScheme('https'));
 
         // 308 keeps headers, request method, and request body
         $response->setStatusCode(308);

diff --git a/src/Middleware/ForceHttps.php b/src/Middleware/ForceHttps.php
@@ -19,8 +19,7 @@ class ForceHttps implements MiddlewareInterface
     /** @var array */
     private $config;
 
-    /** @var RouterInterface */
-    private $router;
+    private RouterInterface $router;
 
     /**
      * @param mixed[] $config
@@ -78,8 +77,7 @@ public function process(
             }
         }
 
-        $httpsRequestUri = $httpsRequestUri
-            ?? $this->getFinalhttpsRequestUri((string) $uri->withScheme('https'));
+        $httpsRequestUri ??= $this->getFinalhttpsRequestUri((string) $uri->withScheme('https'));
 
         // 308 keeps headers, request method, and request body
         $response = $response->withStatus(308);