refactor: Rector - TypedPropertyFromStrictConstructor rule

Author: Matej Grgić

composer.json

@@ -25,7 +25,8 @@
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-beberlei-assert": "^1.1",
-        "thecodingmachine/phpstan-strict-rules": "^1.0"
+        "thecodingmachine/phpstan-strict-rules": "^1.0",
+        "rector/rector": "^1.0"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
+
+return RectorConfig::configure()
+    ->withRules([
+        TypedPropertyFromStrictConstructorRector::class,
+    ]);

rector.php

@@ -12,17 +12,13 @@
 
 class Api implements Contract\Api
 {
-    /** @var string */
-    private $title;
+    private string $title;
 
-    /** @var string */
-    private $version;
+    private string $version;
 
-    /** @var string */
-    private $description;
+    private string $description;
 
-    /** @var null|string */
-    private $email;
+    private ?string $email;
 
     /** @var Endpoint[] */
     private $endpoints = [];

src/Bridge/OpenApi/Model/Api.php

@@ -14,17 +14,14 @@
 
 class CreateResourceEndpoint implements Endpoint
 {
-    /** @var ReadSchema */
-    private $readSchema;
+    private ReadSchema $readSchema;
 
-    /** @var CreateSchema */
-    private $createSchema;
+    private CreateSchema $createSchema;
 
-    /** @var string */
-    private $path;
+    private string $path;
 
     /** @var Response[] */
-    private $responses;
+    private array $responses;
 
     /**
      * @param Response[] $errorResponses

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

@@ -15,20 +15,18 @@
 
 class GetResourceEndpoint implements Endpoint
 {
-    /** @var ReadSchema */
-    private $readSchema;
+    private ReadSchema $readSchema;
 
-    /** @var string */
-    private $path;
+    private string $path;
 
     /** @var Response[] */
-    private $responses;
+    private array $responses;
 
     /** @var ReadSchema[] */
-    private $includes;
+    private array $includes;
 
     /** @var null|mixed[] */
-    private $fields;
+    private ?array $fields;
 
     /**
      * @param ReadSchema[] $includes

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

@@ -16,33 +16,30 @@
 
 class ResourceCollectionEndpoint implements Endpoint
 {
-    /** @var ReadSchema */
-    private $schema;
+    private ReadSchema $schema;
 
-    /** @var string */
-    private $path;
+    private string $path;
 
     /** @var Response[] */
-    private $responses;
+    private array $responses;
 
     /** @var mixed[] */
-    private $filters;
+    private array $filters;
 
     /** @var array<string, ReadSchema> */
-    private $includes;
+    private array $includes;
 
     /** @var mixed[] */
-    private $fields;
+    private array $fields;
 
     /**
      * @var mixed[]
      *
      * @psalm-suppress UnusedProperty
      */
-    private $sorts;
+    private array $sorts;
 
-    /** @var null|Schema */
-    private $pagination;
+    private ?Schema $pagination;
 
     /**
      * @param Filter[]                  $filters

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

@@ -14,14 +14,12 @@
 
 class UpdateResourceEndpoint implements Endpoint
 {
-    /** @var UpdateSchema */
-    private $resourceUpdateSchema;
+    private UpdateSchema $resourceUpdateSchema;
 
-    /** @var string */
-    private $path;
+    private string $path;
 
     /** @var Response[] */
-    private $responses;
+    private array $responses;
 
     /**
      * @param Response[] $errorResponses

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

@@ -9,11 +9,9 @@
 
 class CreateResourceRequest implements Request
 {
-    /** @var string */
-    private $resourceType;
+    private string $resourceType;
 
-    /** @var ResourceSchema */
-    private $schema;
+    private ResourceSchema $schema;
 
     public function __construct(string $resourceType, ResourceSchema $schema)
     {

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

@@ -9,11 +9,9 @@
 
 class UpdateResourceRequest implements Request
 {
-    /** @var string */
-    private $resourceType;
+    private string $resourceType;
 
-    /** @var UpdateSchema */
-    private $schema;
+    private UpdateSchema $schema;
 
     public function __construct(string $resourceType, UpdateSchema $schema)
     {

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

@@ -11,11 +11,10 @@
 
 class CollectionResponse implements Response
 {
-    /** @var ReadSchema */
-    private $schema;
+    private ReadSchema $schema;
 
     /** @var array<string, ReadSchema> */
-    private $includes;
+    private array $includes;
 
     /**
      * @param array<string, ReadSchema> $includes

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

@@ -16,7 +16,7 @@ final class IncludedSchema implements Schema
      *
      * @var array<string, ReadSchema>
      */
-    private $includes;
+    private array $includes;
 
     /**
      * @param array<string, ReadSchema> $includes

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

@@ -11,11 +11,10 @@
 
 class ResourceResponse implements Response
 {
-    /** @var ReadSchema */
-    private $readSchema;
+    private ReadSchema $readSchema;
 
     /** @var array<string, ReadSchema> */
-    private $includes;
+    private array $includes;
 
     /**
      * @param array<string, ReadSchema> $includes

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

@@ -9,23 +9,17 @@
 
 class AttributeSchema implements Schema
 {
-    /** @var string */
-    private $name;
+    private string $name;
 
-    /** @var string */
-    private $type;
+    private string $type;
 
-    /** @var bool */
-    private $nullable;
+    private bool $nullable;
 
-    /** @var null|string */
-    private $description;
+    private ?string $description;
 
-    /** @var null|string */
-    private $format;
+    private ?string $format;
 
-    /** @var null|string */
-    private $example;
+    private ?string $example;
 
     public function __construct(
         string $name,

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

@@ -10,14 +10,11 @@
 
 final class Filter
 {
-    /** @var string */
-    private $name;
+    private string $name;
 
-    /** @var Schema */
-    private $schema;
+    private Schema $schema;
 
-    /** @var bool */
-    private $required;
+    private bool $required;
 
     public function __construct(string $name, Schema $schema, bool $required = false)
     {

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

@@ -8,11 +8,10 @@
 
 class FilterSetQueryParam implements Schema
 {
-    /** @var string */
-    private $name;
+    private string $name;
 
     /** @var Filter[] */
-    private $filters;
+    private array $filters;
 
     /**
      * @param Filter[] $filters

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

@@ -8,11 +8,9 @@
 
 class IntegerSchema implements Schema
 {
-    /** @var null|int */
-    private $example;
+    private ?int $example;
 
-    /** @var null|string */
-    private $description;
+    private ?string $description;
 
     public function __construct(?int $example, ?string $description)
     {

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

@@ -8,17 +8,13 @@
 
 class PathParam implements Schema
 {
-    /** @var string */
-    private $name;
+    private string $name;
 
-    /** @var bool */
-    private $required;
+    private bool $required;
 
-    /** @var string */
-    private $description;
+    private string $description;
 
-    /** @var Schema */
-    private $schema;
+    private Schema $schema;
 
     public function __construct(string $name, bool $required, string $description, Schema $schema)
     {