more set list

Author: samsonasik

composer.json

@@ -39,7 +39,7 @@
         "php-coveralls/php-coveralls": "^2.1",
         "phpstan/phpstan": "^0.12.93",
         "phpstan/phpstan-webmozart-assert": "^0.12",
-        "rector/rector": "^0.11.40"
+        "rector/rector": "dev-main#92318a4"
     },
     "config": {
         "bin-dir": "bin",
@@ -64,6 +64,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf"
     },
-    "minimum-stability": "alpha",
+    "minimum-stability": "dev",
     "prefer-stable": true
 }

rector.php

@@ -8,14 +8,15 @@
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(SetList::DEFLUENT);
     $containerConfigurator->import(SetList::PHP_70);
     $containerConfigurator->import(SetList::PHP_71);
     $containerConfigurator->import(SetList::PHP_72);
     $containerConfigurator->import(SetList::PHP_73);
     $containerConfigurator->import(SetList::CODE_QUALITY);
-    $containerConfigurator->import(SetList::CODE_QUALITY_STRICT);
     $containerConfigurator->import(SetList::NAMING);
     $containerConfigurator->import(SetList::TYPE_DECLARATION);
+    $containerConfigurator->import(SetList::ORDER);
 
     $parameters = $containerConfigurator->parameters();
     $parameters->set(Option::PATHS, [__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/spec']);

src/Listener/ForceHttps.php

@@ -45,28 +45,12 @@ public function attach(EventManagerInterface $eventManager, $priority = 1): void
         $this->listeners[] = $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'forceHttpsScheme'], 1000);
     }
 
-    private function setHttpStrictTransportSecurity(
-        string $uriScheme,
-        Response $response,
-        ?RouteMatch $routeMatch
-    ): Response {
-        if ($this->isSkippedHttpStrictTransportSecurity($uriScheme, $routeMatch)) {
-            return $response;
-        }
-
-        if ($this->config['strict_transport_security']['enable'] === true) {
-            $response->getHeaders()
-                     ->addHeaderLine(sprintf(
-                         'Strict-Transport-Security: %s',
-                         $this->config['strict_transport_security']['value']
-                     ));
-            return $response;
-        }
-
-        // set max-age = 0 to strictly expire it,
-        $response->getHeaders()
-                 ->addHeaderLine('Strict-Transport-Security: max-age=0');
-        return $response;
+    /**
+     * Check if currently running in console
+     */
+    private function isInConsole(): bool
+    {
+        return PHP_SAPI === 'cli' || defined('STDIN');
     }
 
     /**
@@ -111,11 +95,27 @@ public function forceHttpsScheme(MvcEvent $mvcEvent): void
         exit(0);
     }
 
-    /**
-     * Check if currently running in console
-     */
-    private function isInConsole(): bool
-    {
-        return PHP_SAPI === 'cli' || defined('STDIN');
+    private function setHttpStrictTransportSecurity(
+        string $uriScheme,
+        Response $response,
+        ?RouteMatch $routeMatch
+    ): Response {
+        if ($this->isSkippedHttpStrictTransportSecurity($uriScheme, $routeMatch)) {
+            return $response;
+        }
+
+        if ($this->config['strict_transport_security']['enable'] === true) {
+            $response->getHeaders()
+                     ->addHeaderLine(sprintf(
+                         'Strict-Transport-Security: %s',
+                         $this->config['strict_transport_security']['value']
+                     ));
+            return $response;
+        }
+
+        // set max-age = 0 to strictly expire it,
+        $response->getHeaders()
+                 ->addHeaderLine('Strict-Transport-Security: max-age=0');
+        return $response;
     }
 }