feat(php8): update project into php 8.1

.github/workflows/analysis.yaml

@@ -30,7 +30,7 @@ jobs:
 
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 7.4
+                    php-version: 8.2
                     coverage: pcov
                     tools: composer:v2
                 env:

composer.json

@@ -23,7 +23,8 @@
       "sllh/composer-versions-check": true,
       "ergebnis/composer-normalize": true,
       "pyrech/composer-changelogs": true,
-      "symfony/flex": true
+      "symfony/flex": true,
+      "dereuromark/composer-versions-check": true
     }
   },
   "autoload": {
@@ -41,7 +42,7 @@
     }
   },
   "require": {
-    "php": ">=7.4",
+    "php": ">=8.1",
     "ext-ctype": "*",
     "ext-iconv": "*",
     "ext-json": "*",
@@ -88,8 +89,9 @@
     "phpstan/phpstan-strict-rules": "^1.1",
     "phpstan/phpstan-symfony": "^1.0",
     "pyrech/composer-changelogs": "^1.8",
+    "rector/rector": "^0.15.23",
     "roave/security-advisories": "dev-latest",
-    "sllh/composer-versions-check": "^2.0",
+    "dereuromark/composer-versions-check": "^0.1",
     "spaze/phpstan-disallowed-calls": "^2.1",
     "symfony/var-dumper": "^4.4 || ^5.0",
     "symplify/easy-coding-standard": "^9.4",
@@ -128,6 +130,9 @@
     "test": [
       "@unit"
     ],
+    "rector": [
+      "vendor/bin/rector process src --ansi --config config/rector.php"
+    ],
     "unit": "vendor/bin/phpunit -c config/phpunit.xml --coverage-clover build/coverage/coverage.xml --exclude-group=integration",
     "psalm": "vendor/bin/psalm -c config/psalm.xml",
     "phpstan": "vendor/bin/phpstan analyse -c config/phpstan.neon --ansi",

config/rector.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/config',
+        __DIR__ . '/lib',
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_81,
+    ]);
+};

src/Config/Auth.php

@@ -6,8 +6,6 @@
 
 final class Auth
 {
-    private string $name;
-
     /**
      * @var string[]
      */
@@ -18,9 +16,8 @@ final class Auth
      */
     private array $body = [];
 
-    public function __construct(string $name)
+    public function __construct(private readonly string $name)
     {
-        $this->name = $name;
     }
 
     public function getName(): string

src/Config/Definition.php

@@ -8,19 +8,16 @@
 
 final class Definition
 {
-    private string $format;
+    private readonly string $path;
 
-    private string $path;
-
-    public function __construct(string $path, string $format)
+    public function __construct(string $path, private readonly string $format)
     {
         $path = trim($path, '/');
         $fullPath = $path;
         if (!str_starts_with($path, 'http://') && !str_starts_with($path, 'https://')) {
             $fullPath = Path::getBasePath() . '/' . $path;
         }
         $this->path = $fullPath;
-        $this->format = $format;
     }
 
     public function getFormat(): string

src/Config/Filters.php

@@ -98,7 +98,7 @@ public function writeBaseline(array $exclude): void
             ->toArray()
         ;
         if (file_exists($this->baseline)) {
-            $exclude = array_merge($exclude, $this->getBaseLineExclude());
+            $exclude = [...$exclude, ...$this->getBaseLineExclude()];
         }
         file_put_contents(
             $this->baseline,

src/Config/Plan.php

@@ -10,17 +10,11 @@ final class Plan
 {
     private ?string $bootstrap = null;
 
-    /**
-     * @var Suite[]
-     */
-    private array $suites;
-
     /**
      * @param Suite[] $suites
      */
-    public function __construct(array $suites)
+    public function __construct(private readonly array $suites)
     {
-        $this->suites = $suites;
     }
 
     /**

src/Config/Suite.php

@@ -26,12 +26,8 @@ final class Suite
      */
     private array $beforeTestCaseCallbacks = [];
 
-    private Definition $definition;
-
     private Filters $filters;
 
-    private string $name;
-
     /**
      * @var array<string, array<string, mixed>>
      */
@@ -43,10 +39,8 @@ final class Suite
 
     private string $testCaseClass = TestCase::class;
 
-    public function __construct(string $name, Definition $definition)
+    public function __construct(private readonly string $name, private readonly Definition $definition)
     {
-        $this->name = $name;
-        $this->definition = $definition;
         $this->filters = new Filters();
         $this->requester = HttpAsyncRequester::getName();
     }

src/Definition/Api.php

@@ -11,11 +11,11 @@
 
 final class Api
 {
-    private ?string $title;
+    private ?string $title = null;
 
-    private ?string $description;
+    private ?string $description = null;
 
-    private ?string $version;
+    private ?string $version = null;
 
     private Operations $operations;
 

src/Definition/Body.php

@@ -14,9 +14,7 @@ final class Body
 {
     private Operation $parent;
 
-    private string $mediaType;
-
-    private Schema $schema;
+    private readonly Schema $schema;
 
     private bool $required = false;
 
@@ -25,18 +23,17 @@ final class Body
      *
      * @throws TypeErrorException
      */
-    public function __construct($schema, string $mediaType = 'application/json')
+    public function __construct($schema, private readonly string $mediaType = 'application/json')
     {
         $this->schema = $schema instanceof Schema ? $schema : new Schema($schema);
-        $this->mediaType = $mediaType;
     }
 
     /**
      * @param Schema|array<mixed> $schema
      *
      * @throws TypeErrorException
      */
-    public static function create($schema, string $mediaType = 'application/json'): self
+    public static function create(\cebe\openapi\spec\Schema|array $schema, string $mediaType = 'application/json'): self
     {
         return new self($schema, $mediaType);
     }

src/Definition/Example/BodyExample.php

@@ -12,17 +12,11 @@ final class BodyExample
 
     private string $mediaType = 'application/json';
 
-    /**
-     * @var mixed[]
-     */
-    private array $content;
-
     /**
      * @param mixed[] $content
      */
-    public function __construct(array $content = [])
+    public function __construct(private readonly array $content = [])
     {
-        $this->content = $content;
     }
 
     /**

src/Definition/Example/OperationExample.php

@@ -19,8 +19,6 @@
 
 final class OperationExample
 {
-    private string $name;
-
     private ?Operation $parent = null;
 
     /**
@@ -50,11 +48,10 @@ final class OperationExample
 
     private ?string $path = null;
 
-    private DeepCopy $deepCopy;
+    private readonly DeepCopy $deepCopy;
 
-    public function __construct(string $name, Operation $parent = null)
+    public function __construct(private string $name, Operation $parent = null)
     {
-        $this->name = $name;
         if (null !== $parent) {
             $this->parent = $parent;
         }

src/Definition/Example/ResponseExample.php

@@ -20,24 +20,12 @@ final class ResponseExample
      */
     private array $headers = [];
 
-    /**
-     * @var mixed
-     */
-    private $content;
-
-    /**
-     * @param mixed $content
-     */
-    public function __construct(?string $statusCode = null, $content = null)
+    public function __construct(?string $statusCode = null, private mixed $content = null)
     {
-        $this->content = $content;
         $this->statusCode = $statusCode ?? $this->statusCode;
     }
 
-    /**
-     * @param mixed $content
-     */
-    public static function create(?string $statusCode = null, $content = null): self
+    public static function create(?string $statusCode = null, mixed $content = null): self
     {
         return new self($statusCode, $content);
     }
@@ -106,10 +94,7 @@ public function getContent()
         return $this->content;
     }
 
-    /**
-     * @param mixed $content
-     */
-    public function setContent($content): self
+    public function setContent(mixed $content): self
     {
         $this->content = $content;
 

src/Definition/Loader/OpenApiDefinitionLoader.php

@@ -387,7 +387,7 @@ private function getExamples(\cebe\openapi\spec\Operation $operation, array $par
                         $example = $this->extractDeepExamples($mediaType->schema);
                         $operationExample = $this->getExample('properties', $examples);
                         $operationExample->setBody(BodyExample::create($example));
-                    } catch (ExampleNotExtractableException $e) {
+                    } catch (ExampleNotExtractableException) {
                         // @ignoreException
                     }
                 }
@@ -430,7 +430,7 @@ private function getExamples(\cebe\openapi\spec\Operation $operation, array $par
                         $operationExample->setResponse(
                             new ResponseExample((string) $statusCode, $example)
                         );
-                    } catch (ExampleNotExtractableException $e) {
+                    } catch (ExampleNotExtractableException) {
                         // @ignoreException
                     }
                 }

src/Definition/Operation.php

@@ -23,14 +23,8 @@ final class Operation implements Filterable
 
     private Parameters $headers;
 
-    private string $id;
-
-    private string $method;
-
     private Api $parent;
 
-    private string $path;
-
     private Parameters $pathParameters;
 
     private string $preparator;
@@ -50,13 +44,10 @@ final class Operation implements Filterable
     private OperationExamples $examples;
 
     public function __construct(
-        string $id,
-        string $path,
-        string $method
+        private readonly string $id,
+        private readonly string $path,
+        private string $method
     ) {
-        $this->id = $id;
-        $this->path = $path;
-        $this->method = $method;
         $this->pathParameters = new Parameters();
         $this->queryParameters = new Parameters();
         $this->headers = new Parameters();