Apply php8.0 in Rector preset

rector.php

@@ -94,5 +94,5 @@
         // cache
         '*/runtime/cache/*',
     ])
-    ->withPhpSets(php74: true)
+    ->withPhpSets(php80: true)
     ->withPreparedSets(deadCode: true);

src/AuthHttp/tests/Diactoros/ResponseFactory.php

@@ -11,12 +11,8 @@
 
 final class ResponseFactory implements ResponseFactoryInterface
 {
-    /** @var HttpConfig */
-    protected $config;
-
-    public function __construct(HttpConfig $config)
+    public function __construct(protected HttpConfig $config)
     {
-        $this->config = $config;
     }
 
 

src/AuthHttp/tests/Middleware/AuthMiddlewareTest.php

@@ -35,7 +35,7 @@ public function testAttributeRead(): void
         $http->setHandler(
             static function (ServerRequestInterface $request, ResponseInterface $response): void {
                 $response->getBody()->write(
-                    get_class($request->getAttribute('authContext'))
+                    $request->getAttribute('authContext')::class
                 );
             }
         );

src/Boot/src/helpers.php

@@ -54,10 +54,9 @@ function directory(string $alias): string
      * Gets the value of an environment variable. Uses application core from the current global scope.
      *
      * @param non-empty-string $key
-     * @param mixed  $default
      * @return mixed
      */
-    function env(string $key, $default = null)
+    function env(string $key, mixed $default = null)
     {
         return spiral(EnvironmentInterface::class)->get($key, $default);
     }

src/Config/tests/Value.php

@@ -6,11 +6,8 @@
 
 class Value
 {
-    private $value;
-
-    public function __construct(string $value = 'value!')
+    public function __construct(private string $value = 'value!')
     {
-        $this->value = $value;
     }
 
     public function getValue()

src/Console/tests/ShortException.php

@@ -6,7 +6,7 @@
 
 class ShortException extends \Exception
 {
-    public function __toString()
+    public function __toString(): string
     {
         return 'exception';
     }

src/Cookies/tests/TestResponseFactory.php

@@ -11,12 +11,8 @@
 
 final class TestResponseFactory implements ResponseFactoryInterface
 {
-    /** @var HttpConfig */
-    protected $config;
-
-    public function __construct(HttpConfig $config)
+    public function __construct(protected HttpConfig $config)
     {
-        $this->config = $config;
     }
 
 

src/Core/tests/ScopesTest.php

@@ -90,7 +90,7 @@ public function testContainerScopeException(): void
             ], function () use ($c): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
         }
 
         $this->assertSame('a', $c->get('bucket')->getName());

src/Csrf/tests/TestResponseFactory.php

@@ -11,11 +11,8 @@
 
 final class TestResponseFactory implements ResponseFactoryInterface
 {
-    protected readonly HttpConfig $config;
-
-    public function __construct(HttpConfig $config)
+    public function __construct(protected readonly HttpConfig $config)
     {
-        $this->config = $config;
     }
 
 

src/Distribution/src/Manager.php

@@ -14,11 +14,9 @@ final class Manager implements MutableDistributionInterface
      * @var array<string, UriResolverInterface>
      */
     private array $resolvers = [];
-    private string $default;
 
-    public function __construct(string $name = self::DEFAULT_RESOLVER)
+    public function __construct(private string $default = self::DEFAULT_RESOLVER)
     {
-        $this->default = $name;
     }
 
     /**

src/Distribution/tests/Resolver/StaticResolverTest.php

@@ -20,7 +20,7 @@ public function testGuzzleResolve(): void
         // PHP 8.1 deprecation error fix
         self::assertTrue(
             ($error = error_get_last()) === null ||
-            \strpos($error['message'], 'Spiral') === false
+            !str_contains($error['message'], 'Spiral')
         );
     }
 
@@ -35,7 +35,7 @@ public function testGuzzleResolveWithPrefix(): void
         // PHP 8.1 deprecation error fix
         self::assertTrue(
             ($error = error_get_last()) === null ||
-            \strpos($error['message'], 'Spiral') === false
+            !str_contains($error['message'], 'Spiral')
         );
     }
 }

src/Http/src/Stream/GeneratorStream.php

@@ -10,8 +10,6 @@
 
 final class GeneratorStream implements StreamInterface
 {
-    private ?Generator $stream;
-
     private bool $readable = true;
 
     private ?int $size = null;
@@ -20,16 +18,15 @@ final class GeneratorStream implements StreamInterface
 
     private bool $started = false;
 
-    public function __construct(Generator $body)
+    public function __construct(private ?Generator $stream)
     {
-        $this->stream = $body;
     }
 
     public function __toString(): string
     {
         try {
             return $this->getContents();
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             return '';
         }
     }

src/Http/tests/Diactoros/ResponseFactory.php

@@ -11,12 +11,8 @@
 
 final class ResponseFactory implements ResponseFactoryInterface
 {
-    /** @var HttpConfig */
-    protected $config;
-
-    public function __construct(HttpConfig $config)
+    public function __construct(protected HttpConfig $config)
     {
-        $this->config = $config;
     }
 
     public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface

src/Http/tests/Json.php

@@ -6,11 +6,8 @@
 
 class Json implements \JsonSerializable
 {
-    private $data;
-
-    public function __construct($data)
+    public function __construct(private $data)
     {
-        $this->data = $data;
     }
 
     #[\ReturnTypeWillChange]

src/Http/tests/Streamable.php

@@ -9,11 +9,8 @@
 
 class Streamable implements StreamableInterface
 {
-    private $stream;
-
-    public function __construct(StreamInterface $stream)
+    public function __construct(private StreamInterface $stream)
     {
-        $this->stream = $stream;
     }
 
     public function getStream(): StreamInterface

src/Models/tests/NameValue.php

@@ -6,7 +6,7 @@
 
 use Spiral\Models\ValueInterface;
 
-class NameValue implements ValueInterface
+class NameValue implements ValueInterface, \Stringable
 {
     private $value;
 
@@ -17,7 +17,7 @@ public function __construct($value)
 
     public function __toString(): string
     {
-        return $this->value;
+        return (string) $this->value;
     }
 
     public function setValue(mixed $data): self

src/Prototype/tests/Storage.php

@@ -9,12 +9,8 @@ class Storage
     /** @var array */
     protected $storage = [];
 
-    /** @var string */
-    private $dir;
-
-    public function __construct(string $dir)
+    public function __construct(private string $dir)
     {
-        $this->dir = $dir;
     }
 
     public function store(string $name): void

src/Queue/src/Attribute/Queueable.php

@@ -20,10 +20,7 @@
 #[\Attribute(\Attribute::TARGET_CLASS), NamedArgumentConstructor]
 final class Queueable
 {
-    public ?string $queue = null;
-
-    public function __construct(string $queue = null)
+    public function __construct(public ?string $queue = null)
     {
-        $this->queue = $queue;
     }
 }

src/Queue/src/Interceptor/Push/Core.php

@@ -72,7 +72,7 @@ private function getTracer(): TracerInterface
     {
         try {
             return ContainerScope::getContainer()->get(TracerInterface::class);
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             return new NullTracer();
         }
     }

src/Queue/src/JobHandler.php

@@ -34,7 +34,7 @@ public function handle(string $name, string $id, mixed $payload, array $headers
 
             $this->invoker->invoke([$this, $this->getHandlerMethod()], $params);
         } catch (\Throwable $e) {
-            $message = \sprintf('[%s] %s', $this::class, $e->getMessage());
+            $message = \sprintf('[%s] %s', static::class, $e->getMessage());
             throw new JobException($message, (int)$e->getCode(), $e);
         }
     }

src/Queue/src/QueueableDetector.php

@@ -9,11 +9,8 @@
 
 final class QueueableDetector
 {
-    private ReaderInterface $reader;
-
-    public function __construct(ReaderInterface $reader)
+    public function __construct(private ReaderInterface $reader)
     {
-        $this->reader = $reader;
     }
 
     /**

src/Queue/tests/Job/ObjectJobTest.php

@@ -42,11 +42,8 @@ public function testPayloadObjectValueShouldBeObject(): void
     public function testHandleWithHandleMethod(): void
     {
         $object = new class($this) {
-            private $testCase;
-
-            public function __construct($testCase)
+            public function __construct(private $testCase)
             {
-                $this->testCase = $testCase;
             }
 
             public function handle(string $name, string $id, ContainerInterface $container): void
@@ -65,11 +62,8 @@ public function handle(string $name, string $id, ContainerInterface $container):
     public function testHandleWithInvokeMethod(): void
     {
         $object = new class($this) {
-            private $testCase;
-
-            public function __construct($testCase)
+            public function __construct(private $testCase)
             {
-                $this->testCase = $testCase;
             }
 
             public function __invoke(string $name, string $id, ContainerInterface $container): void

src/Router/tests/Diactoros/ResponseFactory.php

@@ -11,12 +11,8 @@
 
 final class ResponseFactory implements ResponseFactoryInterface
 {
-    /** @var HttpConfig */
-    protected $config;
-
-    public function __construct(HttpConfig $config)
+    public function __construct(protected HttpConfig $config)
     {
-        $this->config = $config;
     }
 
     public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface

src/Router/tests/TestCore.php

@@ -8,11 +8,8 @@
 
 class TestCore implements CoreInterface
 {
-    private $core;
-
-    public function __construct(CoreInterface $core)
+    public function __construct(private CoreInterface $core)
     {
-        $this->core = $core;
     }
 
     public function callAction(string $controller, string $action = null, array $parameters = []): string

src/Scaffolder/src/Declaration/FilterDeclaration.php

@@ -33,7 +33,7 @@ public function __construct(
 
         try {
             $this->validationConfig = $container->get(ValidationConfig::class);
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             // Validation is not configured
             $this->validationConfig = null;
         }

src/Security/src/Rule.php

@@ -61,7 +61,7 @@ public function allows(ActorInterface $actor, string $permission, array $context
         try {
             return $method->invokeArgs($this, $this->resolver->resolveArguments($method, $parameters));
         } catch (\Throwable $e) {
-            throw new RuleException(\sprintf('[%s] %s', $this::class, $e->getMessage()), (int) $e->getCode(), $e);
+            throw new RuleException(\sprintf('[%s] %s', static::class, $e->getMessage()), (int) $e->getCode(), $e);
         }
     }
 }

src/Security/tests/RuleManagerTest.php

@@ -35,7 +35,7 @@ public function setUp(): void
 
     public function testFlow(): void
     {
-        $ruleClass = get_class($this->rule);
+        $ruleClass = $this->rule::class;
 
         $this->container->shouldReceive('get')
             ->once()
@@ -60,7 +60,7 @@ public function testFlow(): void
 
     public function testHasWithNotRegisteredClass(): void
     {
-        $ruleClass = get_class($this->rule);
+        $ruleClass = $this->rule::class;
         $manager = new RuleManager($this->container);
 
         $this->assertTrue($manager->has($ruleClass));

src/SendIt/tests/JobTest.php

@@ -63,7 +63,7 @@ public function testHandlerError(): void
                 'id',
                 json_encode(MessageSerializer::pack($this->getMail()))
             );
-        } catch (TransportException $e) {
+        } catch (TransportException) {
         }
     }
 

src/Serializer/tests/Fixture/SomeClass.php

@@ -6,14 +6,7 @@
 
 class SomeClass implements SomeInterface
 {
-    public function __construct(int $id, string $text, bool $active)
+    public function __construct(public int $id, public string $text, public bool $active)
     {
-        $this->id = $id;
-        $this->text = $text;
-        $this->active = $active;
     }
-
-    public int $id;
-    public string $text;
-    public bool $active;
 }