apply rector

Author: samsonasik

.gitattributes

@@ -5,4 +5,5 @@
 /spec/ export-ignore
 /CONTRIBUTING.md export-ignore
 /phpcs.xml export-ignore
-/kahlan-config.php export-ignore
+/kahlan-config.php export-ignore
+/rector.php export-ignore

composer.json

@@ -33,12 +33,13 @@
     },
     "require-dev": {
         "kahlan/kahlan": "^5.0",
-        "php-coveralls/php-coveralls": "^2.1",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-webmozart-assert": "^0.12",
         "laminas/laminas-coding-standard": "^2.0",
+        "laminas/laminas-mvc": "^3.0",
         "mezzio/mezzio": "^3.0",
-        "laminas/laminas-mvc": "^3.0"
+        "php-coveralls/php-coveralls": "^2.1",
+        "phpstan/phpstan": "^0.12.93",
+        "phpstan/phpstan-webmozart-assert": "^0.12",
+        "rector/rector": "^0.11.40"
     },
     "config": {
         "bin-dir": "bin",

config/module.config.php

@@ -2,13 +2,15 @@
 
 namespace ForceHttpsModule;
 
+use ForceHttpsModule\Listener\ForceHttps;
+use ForceHttpsModule\Listener\ForceHttpsFactory;
 return [
     'service_manager' => [
         'factories' => [
-            Listener\ForceHttps::class => Listener\ForceHttpsFactory::class,
+            ForceHttps::class => ForceHttpsFactory::class,
         ],
     ],
     'listeners' => [
-        Listener\ForceHttps::class,
+        ForceHttps::class,
     ],
 ];

rector.php

@@ -0,0 +1,27 @@
+<?php
+
+use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector;
+use Rector\CodeQuality\Rector\Include_\AbsolutizeRequireAndIncludePathRector;
+use Rector\Core\Configuration\Option;
+use Rector\Core\ValueObject\PhpVersion;
+use Rector\Set\ValueObject\SetList;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $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);
+
+    $parameters = $containerConfigurator->parameters();
+    $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,
+        CallableThisArrayToAnonymousFunctionRector::class,
+    ]);
+};

src/HttpsTrait.php

@@ -40,21 +40,10 @@ private function isGoingToBeForcedToHttps($match = null): bool
         $matchedRouteName = $match->getMatchedRouteName();
 
         if ($this->config['force_all_routes']) {
-            if (
-                ! empty($this->config['exclude_specific_routes'])
-                && in_array($matchedRouteName, $this->config['exclude_specific_routes'])
-            ) {
-                return false;
-            }
-
-            return true;
+            return ! (! empty($this->config['exclude_specific_routes'])
+            && in_array($matchedRouteName, $this->config['exclude_specific_routes']));
         }
-
-        if (! in_array($matchedRouteName, $this->config['force_specific_routes'])) {
-            return false;
-        }
-
-        return true;
+        return (bool) in_array($matchedRouteName, $this->config['force_specific_routes']);
     }
 
     /**
@@ -111,8 +100,7 @@ private function withoutWwwPrefixWhenNotRequired(string $httpsRequestUri): strin
     private function getFinalhttpsRequestUri(string $httpsRequestUri): string
     {
         $httpsRequestUri = $this->withWwwPrefixWhenRequired($httpsRequestUri);
-        $httpsRequestUri = $this->withoutWwwPrefixWhenNotRequired($httpsRequestUri);
 
-        return $httpsRequestUri;
+        return $this->withoutWwwPrefixWhenNotRequired($httpsRequestUri);
     }
 }