Merge pull request #1141: Apply php8.1 in Rector preset

psalm.xml

@@ -31,5 +31,10 @@
                 <referencedClass name="Psr\Container\ContainerExceptionInterface"/>
             </errorLevel>
         </InvalidThrow>
+        <RedundantCast>
+            <errorLevel type="suppress">
+                <file name="src/Core/src/Internal/Proxy/ProxyClassRenderer.php"/>
+            </errorLevel>
+        </RedundantCast>
     </issueHandlers>
 </psalm>

rector.php

@@ -17,6 +17,8 @@
 use Rector\Php70\Rector\StmtsAwareInterface\IfIssetToCoalescingRector;
 use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
+use Rector\Php81\Rector\ClassMethod\NewInInitializerRector;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 
 return RectorConfig::configure()
     ->withPaths([
@@ -79,6 +81,7 @@
         RemoveUnusedPublicMethodParameterRector::class,
         RemoveEmptyClassMethodRector::class,
         RemoveUnusedPromotedPropertyRector::class,
+        NewInInitializerRector::class,
 
         // start with short open tag
         __DIR__ . '/src/Views/tests/fixtures/other/var.php',
@@ -87,6 +90,7 @@
         // example code for test
         '*/Fixture/*',
         '*/Fixtures/*',
+        '*/fixtures/*',
         '*/Stub/*',
         '*/Stubs/*',
         '*/tests/Classes/*',
@@ -95,8 +99,13 @@
 
         // cache
         '*/runtime/cache/*',
+
+        ReadOnlyPropertyRector::class => [
+            // used by Configurator
+            __DIR__ . '/src/Scaffolder/src/Command',
+        ],
     ])
-    ->withPhpSets(php80: true)
+    ->withPhpSets(php81: true)
     ->withPreparedSets(deadCode: true)
     ->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
         ClassPropertyAssignToConstructorPromotionRector::RENAME_PROPERTY => false,

src/AuthHttp/src/Transport/CookieTransport.php

@@ -16,7 +16,7 @@
 final class CookieTransport implements HttpTransportInterface
 {
     public function __construct(
-        private string $cookie,
+        private readonly string $cookie,
         private readonly string $basePath = '/',
         private readonly ?string $domain = null,
         private readonly bool $secure = false,

src/Boot/src/BootloadManager/BootloadManager.php

@@ -13,7 +13,7 @@
  */
 final class BootloadManager extends AbstractBootloadManager
 {
-    private InvokerStrategyInterface $invokerStrategy;
+    private readonly InvokerStrategyInterface $invokerStrategy;
 
     public function __construct(
         ScopeInterface $scope,

src/Boot/src/Bootloader/ConfigurationBootloader.php

@@ -27,7 +27,7 @@ final class ConfigurationBootloader extends Bootloader
         ConfigManager::class         => [self::class, 'configManager'],
     ];
 
-    private ConfiguratorInterface $configurator;
+    private readonly ConfiguratorInterface $configurator;
 
     /** @var FileLoaderInterface[] */
     private array $loaders;

src/Boot/src/Environment.php

@@ -24,7 +24,7 @@ final class Environment implements EnvironmentInterface
 
     public function __construct(
         array $values = [],
-        private bool $overwrite = false
+        private readonly bool $overwrite = false
     ) {
         $this->values = $values + $_ENV + $_SERVER;
     }

src/Config/src/Patch/Group.php

@@ -9,7 +9,7 @@
 final class Group implements PatchInterface
 {
     /** @var PatchInterface[] */
-    private array $patches;
+    private readonly array $patches;
 
     public function __construct(PatchInterface ...$patch)
     {

src/Config/tests/Value.php

@@ -6,7 +6,7 @@
 
 class Value
 {
-    public function __construct(private string $value = 'value!')
+    public function __construct(private readonly string $value = 'value!')
     {
     }
 

src/Console/src/Configurator/ConstantBasedConfigurator.php

@@ -17,11 +17,11 @@ public function configure(Command $command, \ReflectionClass $reflection): void
         $command->setDescription((string) $reflection->getConstant('DESCRIPTION'));
 
         foreach ($reflection->getMethod('defineOptions')->invoke($command) as $option) {
-            \call_user_func_array([$command, 'addOption'], $option);
+            $command->addOption(...$option);
         }
 
         foreach ($reflection->getMethod('defineArguments')->invoke($command) as $argument) {
-            \call_user_func_array([$command, 'addArgument'], $argument);
+            $command->addArgument(...$argument);
         }
     }
 

src/Console/src/Configurator/Signature/Parser.php

@@ -58,7 +58,7 @@ private function parseParameters(array $tokens): array
         $options = [];
 
         foreach ($tokens as $token) {
-            if (\preg_match('/-{2,}(.*)/', $token, $matches)) {
+            if (\preg_match('/-{2,}(.*)/', (string) $token, $matches)) {
                 $options[] = $this->parseOption($matches[1]);
             } else {
                 $arguments[] = $this->parseArgument($token);

src/Console/tests/PromptArgumentsTest.php

@@ -99,7 +99,7 @@ public function testPromptArgumentWithQuestionOnProperty(): void
             new #[AsCommand(name: 'foo')] class extends Command
             {
                 #[Question(question: 'This is question from the attribute on the property')]
-                private string $email;
+                private readonly string $email;
 
                 public function perform(): int
                 {
@@ -119,10 +119,10 @@ public function testPromptArgumentWithQuestionOnDifferentPropertyShouldBeSkipped
             $promptArguments,
             new #[AsCommand(name: 'foo')] class extends Command
             {
-                private string $email;
+                private readonly string $email;
 
                 #[Question(question: 'This is question from the attribute on the property')]
-                private string $password;
+                private readonly string $password;
 
                 public function perform(): int
                 {

src/Cookies/src/Config/CookiesConfig.php

@@ -52,7 +52,7 @@ public function resolveDomain(UriInterface $uri): ?string
 
         if ($host === 'localhost' || \filter_var($host, FILTER_VALIDATE_IP)) {
             //We can't use sub-domains when website required by IP
-            $pattern = \ltrim($pattern, '.');
+            $pattern = \ltrim((string) $pattern, '.');
         }
 
         if (!str_contains((string) $pattern, '%s')) {

src/Core/src/Config/Inflector.php

@@ -10,7 +10,7 @@
  */
 final class Inflector extends Binding
 {
-    private int $parametersCount;
+    private readonly int $parametersCount;
 
     /**
      * @param \Closure $inflector The first closure argument is the object to be manipulated.

src/Core/src/Internal/Common/Registry.php

@@ -16,9 +16,9 @@ final class Registry
      * @param array<string, object> $objects
      */
     public function __construct(
-        private Config $config,
+        private readonly Config $config,
         private array $objects = [],
-        private Options $options = new Options(),
+        private readonly Options $options = new Options(),
     ) {
     }
 

src/Core/src/Internal/Proxy/ProxyClassRenderer.php

@@ -129,7 +129,7 @@ public static function renderMethod(\ReflectionMethod $m, string $body = ''): st
             $m->isStatic() ? ' static' : '',
             $m->returnsReference() ? '&' : '',
             $m->getName(),
-            \implode(', ', \array_map([self::class, 'renderParameter'], $m->getParameters())),
+            \implode(', ', \array_map(self::renderParameter(...), $m->getParameters())),
             $m->hasReturnType()
                 ? ': ' . self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
                 : '',
@@ -181,7 +181,7 @@ public static function renderDefaultValue(\ReflectionParameter $param): string
         if ($param->isDefaultValueConstant()) {
             $result = $param->getDefaultValueConstantName();
 
-            return \explode('::', $result)[0] === 'self'
+            return \explode('::', (string) $result)[0] === 'self'
                 ? $result
                 : '\\' . $result;
         }

src/Core/tests/AutowireTest.php

@@ -203,7 +203,7 @@ public function testCallMethodWithNullValueOnScalarUnionNull(): void
         $container = new Container();
 
         $result = $container->invoke(
-            [UnionTypes::class, 'unionNull'],
+            UnionTypes::unionNull(...),
             [
                 'nullable' => null,
             ]

src/Distribution/src/Internal/DateTimeFactory.php

@@ -13,7 +13,7 @@ final class DateTimeFactory implements DateTimeFactoryInterface
     private const DEFAULT_TIMEZONE = 'UTC';
     private const DATE_NOW = 'now';
 
-    private \DateTimeZone $timezone;
+    private readonly \DateTimeZone $timezone;
 
     public function __construct(string $timezone = self::DEFAULT_TIMEZONE)
     {

src/Distribution/src/Internal/DateTimeIntervalFactory.php

@@ -13,7 +13,7 @@ final class DateTimeIntervalFactory implements DateTimeIntervalFactoryInterface
     private const ERROR_INVALID_INTERVAL_TYPE = 'The value of type `%s` is not a valid date interval type.';
 
     public function __construct(
-        private DateTimeFactoryInterface $factory = new DateTimeFactory()
+        private readonly DateTimeFactoryInterface $factory = new DateTimeFactory()
     ) {
     }
 

src/Distribution/src/Resolver/CloudFrontResolver.php

@@ -17,14 +17,14 @@
  */
 class CloudFrontResolver extends ExpirationAwareResolver
 {
-    private UrlSigner $signer;
-    private AmazonUriFactory $factory;
+    private readonly UrlSigner $signer;
+    private readonly AmazonUriFactory $factory;
 
     public function __construct(
         string $keyPairId,
         string $privateKey,
-        private string $domain,
-        private ?string $prefix = null
+        private readonly string $domain,
+        private readonly ?string $prefix = null
     ) {
         $this->assertCloudFrontAvailable();
         $this->factory = new AmazonUriFactory();

src/Distribution/src/Resolver/S3SignedResolver.php

@@ -16,9 +16,9 @@
 class S3SignedResolver extends ExpirationAwareResolver
 {
     public function __construct(
-        private S3ClientInterface $client,
-        private string $bucket,
-        private ?string $prefix = null
+        private readonly S3ClientInterface $client,
+        private readonly string $bucket,
+        private readonly ?string $prefix = null
     ) {
         parent::__construct();
     }

src/Distribution/src/Resolver/StaticResolver.php

@@ -12,7 +12,7 @@ class StaticResolver extends UriResolver
 {
     private const URI_PATH_DELIMITER = '/';
 
-    private UriInterface $host;
+    private readonly UriInterface $host;
 
     public function __construct(UriInterface $host)
     {

src/Exceptions/src/Renderer/ConsoleRenderer.php

@@ -160,14 +160,11 @@ private function renderTrace(\Throwable $e, Highlighter $h = null): string
         $pad = \strlen((string)\count($stacktrace));
 
         foreach ($stacktrace as $i => $trace) {
-            $file = null;
+            $file = isset($trace['file']) ? (string) $trace['file'] : null;
             $classColor = 'while';
 
-            if (isset($trace['file'])) {
-                $file = \str_starts_with($trace['file'], $rootDir)
-                    ? \substr($trace['file'], \strlen($rootDir) + 1)
-                    : $trace['file'];
-
+            if ($file !== null) {
+                \str_starts_with($file, $rootDir) and $file = \substr($file, \strlen($rootDir) + 1);
                 $classColor = \str_starts_with($file, 'vendor/') ? 'gray' : 'white';
             }
 

src/Exceptions/src/Renderer/Highlighter.php

@@ -12,7 +12,7 @@
 class Highlighter
 {
     public function __construct(
-        private StyleInterface $renderer
+        private readonly StyleInterface $renderer
     ) {
     }
 

src/Exceptions/src/Renderer/PlainRenderer.php

@@ -87,9 +87,8 @@ private function renderTrace(\Throwable $e, Highlighter $h = null): string
             }
 
             if (isset($trace['file'])) {
-                $file = \str_starts_with($trace['file'], $rootDir)
-                    ? \substr($trace['file'], \strlen($rootDir) + 1)
-                    : $trace['file'];
+                $file = (string) $trace['file'];
+                \str_starts_with($file, $rootDir) and $file = \substr($file, \strlen($rootDir) + 1);
 
                 $line .= \sprintf(' at %s:%s', $file, $trace['line']);
             }

src/Exceptions/src/Reporter/LoggerReporter.php

@@ -11,7 +11,7 @@
 class LoggerReporter implements ExceptionReporterInterface
 {
     public function __construct(
-        private LoggerInterface $logger = new NullLogger()
+        private readonly LoggerInterface $logger = new NullLogger()
     ) {
     }
 

src/Filters/src/Model/Schema/Builder.php

@@ -86,7 +86,7 @@ public function makeSchema(string $name, array $schema): array
 
                 // [class, 'data:something.*'] vs [class, 'data:something']
                 $iterate = \str_contains((string)$origin, '.*') || !empty($definition[self::ITERATE]);
-                $origin = \rtrim($origin, '.*');
+                $origin = \rtrim((string) $origin, '.*');
             } else {
                 $origin = $field;
                 $iterate = true;

src/Filters/tests/Model/Schema/AttributeMapperTest.php

@@ -88,7 +88,7 @@ public function testInputAttribute(): void
                 public int $page;
 
                 #[Attribute]
-                private string $wsPath;
+                private readonly string $wsPath;
 
                 #[BearerToken]
                 public string $token;

src/Hmvc/src/InterceptableCore.php

@@ -16,7 +16,7 @@
  */
 final class InterceptableCore implements CoreInterface, HandlerInterface
 {
-    private InterceptorPipeline $pipeline;
+    private readonly InterceptorPipeline $pipeline;
 
     public function __construct(
         private readonly CoreInterface $core,

src/Http/src/Header/AcceptHeader.php

@@ -95,7 +95,7 @@ private function addItem(AcceptHeaderItem|string $item): void
             $item = AcceptHeaderItem::fromString($item);
         }
 
-        $value = \strtolower($item->getValue());
+        $value = \strtolower((string) $item->getValue());
         if ($value !== '' && (!$this->has($value) || self::compare($item, $this->get($value)) === 1)) {
             $this->sorted = false;
             $this->items[$value] = $item;

src/Http/src/Middleware/ErrorHandlerMiddleware/EnvSuppressErrors.php

@@ -9,7 +9,7 @@
 class EnvSuppressErrors implements SuppressErrorsInterface
 {
     public function __construct(
-        private DebugMode $debugMode
+        private readonly DebugMode $debugMode
     ) {
     }
 

src/Http/src/Request/InputManager.php

@@ -213,7 +213,7 @@ public function request(): Request
      */
     public function bearerToken(): ?string
     {
-        $header = $this->header('Authorization', '');
+        $header = (string) $this->header('Authorization', '');
 
         $position = \strrpos($header, 'Bearer ');
 
@@ -279,7 +279,7 @@ public function isJsonExpected(bool $softMatch = false): bool
 
         if ($softMatch) {
             foreach ($acceptHeader->getAll() as $item) {
-                $itemValue = \strtolower($item->getValue());
+                $itemValue = \strtolower((string) $item->getValue());
                 if (\str_ends_with($itemValue, '/json') || \str_ends_with($itemValue, '+json')) {
                     return true;
                 }

src/Http/tests/Streamable.php

@@ -9,7 +9,7 @@
 
 class Streamable implements StreamableInterface
 {
-    public function __construct(private StreamInterface $stream)
+    public function __construct(private readonly StreamInterface $stream)
     {
     }
 

src/Logger/src/LogFactory.php

@@ -19,7 +19,7 @@ public function __construct(
 
     public function getLogger(string $channel): LoggerInterface
     {
-        return new NullLogger([$this, 'log'], $channel);
+        return new NullLogger($this->log(...), $channel);
     }
 
     public function log(string $channel, mixed $level, string $message, array $context = []): void