refactor: Rector - LevelSetList::UP_TO_PHP_83 rule

Author: Matej Grgić

rector.php

@@ -3,9 +3,15 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
+use Rector\Set\ValueObject\LevelSetList;
 
-return RectorConfig::configure()
-    ->withRules([
-        TypedPropertyFromStrictConstructorRector::class,
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
     ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_83,
+    ]);
+};

src/Bridge/OpenApi/Model/Api.php

@@ -12,14 +12,6 @@
 
 class Api implements Contract\Api
 {
-    private string $title;
-
-    private string $version;
-
-    private string $description;
-
-    private ?string $email;
-
     /** @var Endpoint[] */
     private $endpoints = [];
 
@@ -30,17 +22,7 @@ class Api implements Contract\Api
     private $schemas = [];
 
     /** @todo add support for security schemas */
-    public function __construct(
-        string $title,
-        string $version,
-        string $description,
-        ?string $email = null
-    ) {
-        $this->title = $title;
-        $this->version = $version;
-        $this->description = $description;
-        $this->email = $email;
-    }
+    public function __construct(private string $title, private string $version, private string $description, private ?string $email = null) {}
 
     public function addEndpoint(Endpoint $endpoint): void
     {

src/Bridge/OpenApi/Model/JsonApi/Endpoint/CreateResourceEndpoint.php

@@ -14,28 +14,18 @@
 
 class CreateResourceEndpoint implements Endpoint
 {
-    private ReadSchema $readSchema;
-
-    private CreateSchema $createSchema;
-
-    private string $path;
-
     /** @var Response[] */
     private array $responses;
 
     /**
      * @param Response[] $errorResponses
      */
     public function __construct(
-        ReadSchema $readSchema,
-        CreateSchema $createSchema,
-        string $path,
+        private ReadSchema $readSchema,
+        private CreateSchema $createSchema,
+        private string $path,
         array $errorResponses = []
     ) {
-        $this->createSchema = $createSchema;
-        $this->readSchema = $readSchema;
-        $this->path = $path;
-
         $this->responses = array_merge(
             [
                 new ResourceCreatedResponse($this->readSchema),

src/Bridge/OpenApi/Model/JsonApi/Endpoint/GetResourceEndpoint.php

@@ -15,34 +15,25 @@
 
 class GetResourceEndpoint implements Endpoint
 {
-    private ReadSchema $readSchema;
-
-    private string $path;
-
     /** @var Response[] */
     private array $responses;
 
     /** @var ReadSchema[] */
     private array $includes;
 
-    /** @var null|mixed[] */
-    private ?array $fields;
-
     /**
      * @param ReadSchema[] $includes
      * @param null|mixed[] $fields
      * @param mixed[]      $errorResponses
      */
     public function __construct(
-        ReadSchema $readSchema,
-        string $path,
+        private ReadSchema $readSchema,
+        private string $path,
         array $includes,
-        ?array $fields,
+        private ?array $fields,
         array $errorResponses = []
     ) {
         Assertion::allIsInstanceOf($includes, ReadSchema::class);
-        $this->readSchema = $readSchema;
-        $this->path = $path;
         $this->includes = $includes;
 
         /** @var Response[] $mergedResponses */
@@ -51,7 +42,6 @@ public function __construct(
         ], $errorResponses);
 
         $this->responses = $mergedResponses;
-        $this->fields = $fields;
     }
 
     public function getMethod(): string

src/Bridge/OpenApi/Model/JsonApi/Endpoint/ResourceCollectionEndpoint.php

@@ -16,49 +16,29 @@
 
 class ResourceCollectionEndpoint implements Endpoint
 {
-    private ReadSchema $schema;
-
-    private string $path;
-
     /** @var Response[] */
     private array $responses;
 
-    /** @var mixed[] */
-    private array $filters;
-
-    /** @var array<string, ReadSchema> */
-    private array $includes;
-
-    /** @var mixed[] */
-    private array $fields;
-
-    /**
-     * @var mixed[]
-     *
-     * @psalm-suppress UnusedProperty
-     */
-    private array $sorts;
-
-    private ?Schema $pagination;
-
     /**
      * @param Filter[]                  $filters
      * @param array<string, ReadSchema> $includes
      */
     public function __construct(
-        ReadSchema $schema,
-        string $path,
-        array $filters = [],
-        array $sorts = [],
-        array $includes = [],
-        array $fields = [],
-        ?Schema $pagination = null,
+        private ReadSchema $schema,
+        private string $path,
+        private array $filters = [],
+        /**
+         * @var mixed[]
+         *
+         * @psalm-suppress UnusedProperty
+         */
+        private array $sorts = [],
+        private array $includes = [],
+        /** @var mixed[] */
+        private array $fields = [],
+        private ?Schema $pagination = null,
         array $errorResponses = []
     ) {
-        $this->schema = $schema;
-        $this->path = $path;
-        $this->includes = $includes;
-
         Assertion::allIsInstanceOf($this->includes, ReadSchema::class);
 
         /** @var Response[] $responses */
@@ -70,10 +50,6 @@ public function __construct(
         );
 
         $this->responses = $responses;
-        $this->filters = $filters;
-        $this->sorts = $sorts;
-        $this->fields = $fields;
-        $this->pagination = $pagination;
     }
 
     public function getMethod(): string

src/Bridge/OpenApi/Model/JsonApi/Endpoint/UpdateResourceEndpoint.php

@@ -14,10 +14,6 @@
 
 class UpdateResourceEndpoint implements Endpoint
 {
-    private UpdateSchema $resourceUpdateSchema;
-
-    private string $path;
-
     /** @var Response[] */
     private array $responses;
 
@@ -26,13 +22,10 @@ class UpdateResourceEndpoint implements Endpoint
      */
     public function __construct(
         ReadSchema $resourceReadSchema,
-        UpdateSchema $resourceUpdateSchema,
-        string $path,
+        private UpdateSchema $resourceUpdateSchema,
+        private string $path,
         array $errorResponses = []
     ) {
-        $this->resourceUpdateSchema = $resourceUpdateSchema;
-        $this->path = $path;
-
         $this->responses = array_merge(
             [new ResourceUpdatedResponse($resourceReadSchema)],
             $errorResponses

src/Bridge/OpenApi/Model/JsonApi/Requests/CreateResourceRequest.php

@@ -9,15 +9,7 @@
 
 class CreateResourceRequest implements Request
 {
-    private string $resourceType;
-
-    private ResourceSchema $schema;
-
-    public function __construct(string $resourceType, ResourceSchema $schema)
-    {
-        $this->resourceType = $resourceType;
-        $this->schema = $schema;
-    }
+    public function __construct(private string $resourceType, private ResourceSchema $schema) {}
 
     public function getContentType(): string
     {

src/Bridge/OpenApi/Model/JsonApi/Requests/UpdateResourceRequest.php

@@ -9,15 +9,7 @@
 
 class UpdateResourceRequest implements Request
 {
-    private string $resourceType;
-
-    private UpdateSchema $schema;
-
-    public function __construct(string $resourceType, UpdateSchema $schema)
-    {
-        $this->resourceType = $resourceType;
-        $this->schema = $schema;
-    }
+    public function __construct(private string $resourceType, private UpdateSchema $schema) {}
 
     public function getContentType(): string
     {

src/Bridge/OpenApi/Model/JsonApi/Response/CollectionResponse.php

@@ -11,17 +11,14 @@
 
 class CollectionResponse implements Response
 {
-    private ReadSchema $schema;
-
     /** @var array<string, ReadSchema> */
     private array $includes;
 
     /**
      * @param array<string, ReadSchema> $includes
      */
-    public function __construct(ReadSchema $schema, array $includes)
+    public function __construct(private ReadSchema $schema, array $includes)
     {
-        $this->schema = $schema;
         Assertion::allIsInstanceOf($includes, ReadSchema::class);
         $this->includes = $includes;
     }

src/Bridge/OpenApi/Model/JsonApi/Response/ResourceResponse.php

@@ -11,18 +11,15 @@
 
 class ResourceResponse implements Response
 {
-    private ReadSchema $readSchema;
-
     /** @var array<string, ReadSchema> */
     private array $includes;
 
     /**
      * @param array<string, ReadSchema> $includes
      */
-    public function __construct(ReadSchema $readSchema, array $includes = [])
+    public function __construct(private ReadSchema $readSchema, array $includes = [])
     {
         Assertion::allIsInstanceOf($includes, ReadSchema::class);
-        $this->readSchema = $readSchema;
         $this->includes = $includes;
     }
 

src/Bridge/OpenApi/Model/JsonApi/Schema/AttributeSchema.php

@@ -9,33 +9,7 @@
 
 class AttributeSchema implements Schema
 {
-    private string $name;
-
-    private string $type;
-
-    private bool $nullable;
-
-    private ?string $description;
-
-    private ?string $format;
-
-    private ?string $example;
-
-    public function __construct(
-        string $name,
-        string $type,
-        bool $nullable,
-        ?string $description,
-        ?string $format,
-        ?string $example
-    ) {
-        $this->name = $name;
-        $this->type = $type;
-        $this->nullable = $nullable;
-        $this->description = $description;
-        $this->format = $format;
-        $this->example = $example;
-    }
+    public function __construct(private string $name, private string $type, private bool $nullable, private ?string $description, private ?string $format, private ?string $example) {}
 
     public function toOpenApi(): array
     {

src/Bridge/OpenApi/Model/JsonApi/Schema/Filter/Filter.php

@@ -10,18 +10,7 @@
 
 final class Filter
 {
-    private string $name;
-
-    private Schema $schema;
-
-    private bool $required;
-
-    public function __construct(string $name, Schema $schema, bool $required = false)
-    {
-        $this->name = $name;
-        $this->schema = $schema;
-        $this->required = $required;
-    }
+    public function __construct(private string $name, private Schema $schema, private bool $required = false) {}
 
     public static function integer(
         string $name,

src/Bridge/OpenApi/Model/JsonApi/Schema/Filter/FilterSetQueryParam.php

@@ -8,19 +8,10 @@
 
 class FilterSetQueryParam implements Schema
 {
-    private string $name;
-
-    /** @var Filter[] */
-    private array $filters;
-
     /**
      * @param Filter[] $filters
      */
-    public function __construct(string $name, array $filters)
-    {
-        $this->name = $name;
-        $this->filters = $filters;
-    }
+    public function __construct(private string $name, private array $filters) {}
 
     public function toOpenApi(): array
     {

src/Bridge/OpenApi/Model/JsonApi/Schema/IntegerSchema.php

@@ -8,15 +8,7 @@
 
 class IntegerSchema implements Schema
 {
-    private ?int $example;
-
-    private ?string $description;
-
-    public function __construct(?int $example, ?string $description)
-    {
-        $this->example = $example;
-        $this->description = $description;
-    }
+    public function __construct(private ?int $example, private ?string $description) {}
 
     public function toOpenApi(): array
     {