chore: apply rector to migrate code to PHP 8.1

Author: vincentchalamon

rector.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ]);
+    $rectorConfig->skip([
+        // "Class PHPUnit\Framework\* not found."
+        __DIR__.'/src/Symfony/Bundle/Test',
+        __DIR__.'/tests/Fixtures/app/var',
+        __DIR__.'/tests/ProphecyTrait.php',
+    ]);
+    $rectorConfig->phpstanConfig(__DIR__.'/phpstan.neon.dist');
+    $rectorConfig->importNames();
+    $rectorConfig->disableImportShortClasses();
+
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_81,
+        SetList::TYPE_DECLARATION_STRICT,
+    ]);
+
+    // PHPUnit
+//    $rectorConfig->sets([
+//        PHPUnitSetList::PHPUNIT_91,
+//        PHPUnitSetList::PHPUNIT_CODE_QUALITY,
+//        PHPUnitSetList::PHPUNIT_EXCEPTION,
+//        PHPUnitSetList::REMOVE_MOCKS,
+//        PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
+//        PHPUnitSetList::PHPUNIT_YIELD_DATA_PROVIDER,
+//    ]);
+};

src/Action/EntrypointAction.php

@@ -23,11 +23,8 @@
  */
 final class EntrypointAction
 {
-    private $resourceNameCollectionFactory;
-
-    public function __construct(ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory)
+    public function __construct(private readonly ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory)
     {
-        $this->resourceNameCollectionFactory = $resourceNameCollectionFactory;
     }
 
     public function __invoke(): Entrypoint

src/Action/ExceptionAction.php

@@ -34,19 +34,12 @@ final class ExceptionAction
 {
     use OperationRequestInitiatorTrait;
 
-    private $serializer;
-    private $errorFormats;
-    private $exceptionToStatus;
-
     /**
      * @param array $errorFormats      A list of enabled error formats
      * @param array $exceptionToStatus A list of exceptions mapped to their HTTP status code
      */
-    public function __construct(SerializerInterface $serializer, array $errorFormats, array $exceptionToStatus = [], ?ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null)
+    public function __construct(private readonly SerializerInterface $serializer, private readonly array $errorFormats, private readonly array $exceptionToStatus = [], ?ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null)
     {
-        $this->serializer = $serializer;
-        $this->errorFormats = $errorFormats;
-        $this->exceptionToStatus = $exceptionToStatus;
         $this->resourceMetadataCollectionFactory = $resourceMetadataCollectionFactory;
     }
 

src/Api/Entrypoint.php

@@ -22,11 +22,8 @@
  */
 final class Entrypoint
 {
-    private $resourceNameCollection;
-
-    public function __construct(ResourceNameCollection $resourceNameCollection)
+    public function __construct(private readonly ResourceNameCollection $resourceNameCollection)
     {
-        $this->resourceNameCollection = $resourceNameCollection;
     }
 
     public function getResourceNameCollection(): ResourceNameCollection

src/Api/FilterLocatorTrait.php

@@ -25,7 +25,7 @@
  */
 trait FilterLocatorTrait
 {
-    private ?ContainerInterface $filterLocator;
+    private ?ContainerInterface $filterLocator = null;
 
     /**
      * Sets a filter locator with a backward compatibility.

src/Api/FormatMatcher.php

@@ -23,7 +23,7 @@ final class FormatMatcher
     /**
      * @var array<string, string[]>
      */
-    private $formats;
+    private readonly array $formats;
 
     /**
      * @param array<string, string[]|string> $formats

src/Api/IdentifiersExtractor.php

@@ -33,17 +33,12 @@
 final class IdentifiersExtractor implements IdentifiersExtractorInterface
 {
     use ResourceClassInfoTrait;
+    private readonly PropertyAccessorInterface|PropertyAccessor $propertyAccessor;
 
-    private $propertyNameCollectionFactory;
-    private $propertyMetadataFactory;
-    private $propertyAccessor;
-
-    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, ResourceClassResolverInterface $resourceClassResolver, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, PropertyAccessorInterface $propertyAccessor = null)
+    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, ResourceClassResolverInterface $resourceClassResolver, private readonly PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, private readonly PropertyMetadataFactoryInterface $propertyMetadataFactory, PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->resourceMetadataFactory = $resourceMetadataFactory;
         $this->resourceClassResolver = $resourceClassResolver;
-        $this->propertyNameCollectionFactory = $propertyNameCollectionFactory;
-        $this->propertyMetadataFactory = $propertyMetadataFactory;
         $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
     }
 
@@ -61,7 +56,7 @@ public function getIdentifiersFromItem($item, Operation $operation = null, array
         }
 
         $resourceClass = $this->getResourceClass($item, true);
-        $operation = $operation ?? $this->resourceMetadataFactory->create($resourceClass)->getOperation(null, false, true);
+        $operation ??= $this->resourceMetadataFactory->create($resourceClass)->getOperation(null, false, true);
 
         if ($operation instanceof HttpOperation) {
             $links = $operation->getUriVariables();
@@ -70,7 +65,7 @@ public function getIdentifiersFromItem($item, Operation $operation = null, array
         }
 
         foreach ($links ?? [] as $link) {
-            if (1 < \count($link->getIdentifiers())) {
+            if (1 < (is_countable($link->getIdentifiers()) ? \count($link->getIdentifiers()) : 0)) {
                 $compositeIdentifiers = [];
                 foreach ($link->getIdentifiers() as $identifier) {
                     $compositeIdentifiers[$identifier] = $this->getIdentifierValue($item, $link->getFromClass() ?? $resourceClass, $identifier, $link->getParameterName());

src/Api/QueryParameterValidator/QueryParameterValidator.php

@@ -14,6 +14,13 @@
 namespace ApiPlatform\Api\QueryParameterValidator;
 
 use ApiPlatform\Api\FilterLocatorTrait;
+use ApiPlatform\Api\QueryParameterValidator\Validator\ArrayItems;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Bounds;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Enum;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Length;
+use ApiPlatform\Api\QueryParameterValidator\Validator\MultipleOf;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Pattern;
+use ApiPlatform\Api\QueryParameterValidator\Validator\Required;
 use ApiPlatform\Exception\FilterValidationException;
 use Psr\Container\ContainerInterface;
 
@@ -33,13 +40,13 @@ public function __construct(ContainerInterface $filterLocator)
         $this->setFilterLocator($filterLocator);
 
         $this->validators = [
-            new Validator\ArrayItems(),
-            new Validator\Bounds(),
-            new Validator\Enum(),
-            new Validator\Length(),
-            new Validator\MultipleOf(),
-            new Validator\Pattern(),
-            new Validator\Required(),
+            new ArrayItems(),
+            new Bounds(),
+            new Enum(),
+            new Length(),
+            new MultipleOf(),
+            new Pattern(),
+            new Required(),
         ];
     }
 

src/Api/QueryParameterValidator/Validator/ArrayItems.php

@@ -62,25 +62,20 @@ private function getValue(string $name, array $filterDescription, array $queryPa
 
         $collectionFormat = $filterDescription['swagger']['collectionFormat'] ?? 'csv';
 
-        return explode(self::getSeparator($collectionFormat), $value) ?: []; // @phpstan-ignore-line
+        return explode(self::getSeparator($collectionFormat), (string) $value) ?: []; // @phpstan-ignore-line
     }
 
     /**
      * @return non-empty-string
      */
     private static function getSeparator(string $collectionFormat): string
     {
-        switch ($collectionFormat) {
-            case 'csv':
-                return ',';
-            case 'ssv':
-                return ' ';
-            case 'tsv':
-                return '\t';
-            case 'pipes':
-                return '|';
-            default:
-                throw new \InvalidArgumentException(sprintf('Unknown collection format %s', $collectionFormat));
-        }
+        return match ($collectionFormat) {
+            'csv' => ',',
+            'ssv' => ' ',
+            'tsv' => '\t',
+            'pipes' => '|',
+            default => throw new \InvalidArgumentException(sprintf('Unknown collection format %s', $collectionFormat)),
+        };
     }
 }

src/Api/ResourceClassResolver.php

@@ -26,14 +26,11 @@
 final class ResourceClassResolver implements ResourceClassResolverInterface
 {
     use ClassInfoTrait;
+    private array $localIsResourceClassCache = [];
+    private array $localMostSpecificResourceClassCache = [];
 
-    private $resourceNameCollectionFactory;
-    private $localIsResourceClassCache = [];
-    private $localMostSpecificResourceClassCache = [];
-
-    public function __construct(ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory)
+    public function __construct(private readonly ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory)
     {
-        $this->resourceNameCollectionFactory = $resourceNameCollectionFactory;
     }
 
     /**