rector

CHANGELOG.md

@@ -3,7 +3,7 @@
 ## 3.1.1 under development
 
 - Enh #154: Add `UrlGenerator` host and scheme properties to package config params (@ev-gor)
-- Chg #157: Bump minimal PHP version to 8.1 (@vjik)
+- Chg #157: Bump minimal PHP version to 8.1 and minor refactoring (@vjik)
 
 ## 3.1.0 March 19, 2024
 

rector.php

@@ -5,7 +5,6 @@
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
-use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 
 return RectorConfig::configure()
@@ -19,6 +18,5 @@
     ])
     ->withSkip([
         ClosureToArrowFunctionRector::class,
-        ReadOnlyPropertyRector::class,
         NullToStrictStringFuncCallArgRector::class,
     ]);

src/UrlGenerator.php

@@ -25,18 +25,18 @@ final class UrlGenerator implements UrlGeneratorInterface
     private string $uriPrefix = '';
 
     /**
-     * @var array<string,string>
+     * @psalm-var array<string,string>
      */
     private array $defaultArguments = [];
     private bool $encodeRaw = true;
-    private RouteParser $routeParser;
+    private readonly RouteParser $routeParser;
 
     public function __construct(
-        private RouteCollectionInterface $routeCollection,
-        private ?CurrentRoute $currentRoute = null,
+        private readonly RouteCollectionInterface $routeCollection,
+        private readonly ?CurrentRoute $currentRoute = null,
         ?RouteParser $parser = null,
-        private ?string $scheme = null,
-        private ?string $host = null,
+        private readonly ?string $scheme = null,
+        private readonly ?string $host = null,
     ) {
         $this->routeParser = $parser ?? new RouteParser\Std();
     }

src/UrlMatcher.php

@@ -54,7 +54,7 @@ final class UrlMatcher implements UrlMatcherInterface
      */
     private bool $hasCache = false;
 
-    private RouteCollector $fastRouteCollector;
+    private readonly RouteCollector $fastRouteCollector;
     private bool $hasInjectedRoutes = false;
 
     /**
@@ -74,8 +74,8 @@ final class UrlMatcher implements UrlMatcherInterface
      * @psalm-param DispatcherCallback|null $dispatcherFactory
      */
     public function __construct(
-        private RouteCollectionInterface $routeCollection,
-        private ?CacheInterface $cache = null,
+        private readonly RouteCollectionInterface $routeCollection,
+        private readonly ?CacheInterface $cache = null,
         ?array $config = null,
         ?RouteCollector $fastRouteCollector = null,
         ?callable $dispatcherFactory = null