chore: apply rector to migrate tests to PHP 8.1

Author: vincentchalamon

composer.json

@@ -35,6 +35,7 @@
     "require-dev": {
         "behat/behat": "^3.1",
         "behat/mink": "^1.9@dev",
+        "behatch/contexts": "dev-patch-1",
         "doctrine/cache": "^1.11 || ^2.1",
         "doctrine/common": "^2.11 || ^3.0",
         "doctrine/data-fixtures": "^1.2.2",
@@ -60,7 +61,7 @@
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "ramsey/uuid": "^3.7 || ^4.0",
         "ramsey/uuid-doctrine": "^1.4",
-        "behatch/contexts": "dev-patch-1",
+        "rector/rector": "^0.13.9",
         "soyuka/stubs-mongodb": "^1.0",
         "symfony/asset": "^6.1",
         "symfony/browser-kit": "^6.1",
@@ -142,6 +143,9 @@
     "extra": {
         "branch-alias": {
             "dev-main": "3.0.x-dev"
+        },
+        "symfony": {
+            "require": "^6.1"
         }
     }
 }

rector.php

@@ -40,12 +40,12 @@
     ]);
 
     // 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,
-//    ]);
+    $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/GraphQl/Action/EntrypointAction.php

@@ -35,7 +35,7 @@ final class EntrypointAction
 {
     private int|bool $debug;
 
-    public function __construct(private readonly SchemaBuilderInterface $schemaBuilder, private readonly ExecutorInterface $executor, private readonly GraphiQlAction $graphiQlAction, private readonly GraphQlPlaygroundAction $graphQlPlaygroundAction, private readonly NormalizerInterface $normalizer, private readonly ErrorHandlerInterface $errorHandler, bool $debug = false, private readonly bool $graphiqlEnabled = false, private readonly bool $graphQlPlaygroundEnabled = false, private $defaultIde = false)
+    public function __construct(private readonly SchemaBuilderInterface $schemaBuilder, private readonly ExecutorInterface $executor, private readonly GraphiQlAction $graphiQlAction, private readonly GraphQlPlaygroundAction $graphQlPlaygroundAction, private readonly NormalizerInterface $normalizer, private readonly ErrorHandlerInterface $errorHandler, bool $debug = false, private readonly bool $graphiqlEnabled = false, private readonly bool $graphQlPlaygroundEnabled = false, private readonly ?string $defaultIde = null)
     {
         if (class_exists(Debug::class)) {
             $this->debug = $debug ? Debug::INCLUDE_DEBUG_MESSAGE | Debug::INCLUDE_TRACE : false;
@@ -111,7 +111,7 @@ private function parseRequest(Request $request): array
      */
     private function parseData(?string $query, ?string $operationName, array $variables, string $jsonContent): array
     {
-        if (!\is_array($data = json_decode($jsonContent, true, 512, \JSON_THROW_ON_ERROR))) {
+        if (!\is_array($data = json_decode($jsonContent, true, 512, \JSON_ERROR_NONE))) {
             throw new BadRequestHttpException('GraphQL data is not valid JSON.');
         }
 
@@ -142,7 +142,7 @@ private function parseMultipartRequest(?string $query, ?string $operationName, a
         [$query, $operationName, $variables] = $this->parseData($query, $operationName, $variables, $operations);
 
         /** @var string $map */
-        if (!\is_array($decodedMap = json_decode($map, true, 512, \JSON_THROW_ON_ERROR))) {
+        if (!\is_array($decodedMap = json_decode($map, true, 512, \JSON_ERROR_NONE))) {
             throw new BadRequestHttpException('GraphQL multipart request map is not valid JSON.');
         }
 
@@ -192,7 +192,7 @@ private function applyMapToVariables(array $map, array $variables, array $files)
      */
     private function decodeVariables(string $variables): array
     {
-        if (!\is_array($decoded = json_decode($variables, true, 512, \JSON_THROW_ON_ERROR))) {
+        if (!\is_array($decoded = json_decode($variables, true, 512, \JSON_ERROR_NONE))) {
             throw new BadRequestHttpException('GraphQL variables are not valid JSON.');
         }
 

src/Symfony/Bundle/Resources/config/symfony/events.xml

@@ -69,7 +69,6 @@
             <argument>api_platform.action.exception</argument>
             <argument type="service" id="logger" on-invalid="null" />
             <argument>false</argument>
-            <argument type="service" id="exception_listener" on-invalid="null" />
 
             <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-96" />
             <tag name="monolog.logger" channel="request" />

src/Symfony/EventListener/ExceptionListener.php

@@ -17,7 +17,6 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\EventListener\ErrorListener;
-use Symfony\Component\HttpKernel\EventListener\ExceptionListener as LegacyExceptionListener;
 
 /**
  * Handles requests errors.
@@ -27,11 +26,11 @@
  */
 final class ExceptionListener
 {
-    private readonly ErrorListener $exceptionListener;
+    private readonly ErrorListener $errorListener;
 
-    public function __construct($controller, LoggerInterface $logger = null, $debug = false, ErrorListener $errorListener = null)
+    public function __construct(string|object|array|null $controller, LoggerInterface $logger = null, bool $debug = false)
     {
-        $this->exceptionListener = $errorListener ? new ErrorListener($controller, $logger, $debug) : new LegacyExceptionListener($controller, $logger, $debug); // @phpstan-ignore-line
+        $this->errorListener = new ErrorListener($controller, $logger, $debug);
     }
 
     public function onKernelException(ExceptionEvent $event): void
@@ -45,6 +44,6 @@ public function onKernelException(ExceptionEvent $event): void
             return;
         }
 
-        $this->exceptionListener->onKernelException($event);
+        $this->errorListener->onKernelException($event);
     }
 }

src/Symfony/Maker/Resources/skeleton/StateProcessor.tpl.php

@@ -8,7 +8,7 @@
 
 class <?php echo $class_name; ?> implements ProcessorInterface
 {
-    public function process($data, Operation $operation, array $uriVariables = [], array $context = [])
+    public function process($data, Operation $operation, array $uriVariables = [], array $context = []): void
     {
         // Handle the state
     }

tests/Action/PlaceholderActionTest.php

@@ -21,7 +21,7 @@
  */
 class PlaceholderActionTest extends TestCase
 {
-    public function testAction()
+    public function testAction(): void
     {
         $action = new PlaceholderAction();
 

tests/Api/CompositeIdentifierParserTest.php

@@ -21,7 +21,7 @@ class CompositeIdentifierParserTest extends TestCase
     /**
      * @dataProvider variousIdentifiers
      */
-    public function testNormalizeCompositeCorrectly(array $identifiers)
+    public function testNormalizeCompositeCorrectly(array $identifiers): void
     {
         foreach ($identifiers as $string => $expected) {
             $this->assertEquals(CompositeIdentifierParser::parse($string), $expected);
@@ -45,10 +45,10 @@ public function variousIdentifiers(): array
     /**
      * @dataProvider compositeIdentifiers
      */
-    public function testStringify(array $identifiers)
+    public function testStringify(array $identifiers): void
     {
         foreach ($identifiers as $string => $arr) {
-            $this->assertEquals(CompositeIdentifierParser::stringify($arr), $string);
+            $this->assertSame(CompositeIdentifierParser::stringify($arr), $string);
         }
     }
 

tests/Api/IdentifiersExtractorTest.php

@@ -33,7 +33,7 @@ class IdentifiersExtractorTest extends TestCase
 {
     use ProphecyTrait;
 
-    public function testGetIdentifiersFromItem()
+    public function testGetIdentifiersFromItem(): void
     {
         $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
@@ -60,7 +60,7 @@ public function testGetIdentifiersFromItem()
         $this->assertEquals([], $identifiersExtractor->getIdentifiersFromItem($item, $operation->reveal()));
     }
 
-    public function testGetIdentifiersFromItemWithId()
+    public function testGetIdentifiersFromItemWithId(): void
     {
         $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);

tests/Api/QueryParameterValidator/QueryParameterValidatorTest.php

@@ -48,7 +48,7 @@ protected function setUp(): void
     /**
      * unsafe method should not use filter validations.
      */
-    public function testOnKernelRequestWithUnsafeMethod()
+    public function testOnKernelRequestWithUnsafeMethod(): void
     {
         $request = [];
 
@@ -60,7 +60,7 @@ public function testOnKernelRequestWithUnsafeMethod()
     /**
      * If the tested filter is non-existent, then nothing should append.
      */
-    public function testOnKernelRequestWithWrongFilter()
+    public function testOnKernelRequestWithWrongFilter(): void
     {
         $request = [];
 
@@ -73,7 +73,7 @@ public function testOnKernelRequestWithWrongFilter()
     /**
      * if the required parameter is not set, throw an FilterValidationException.
      */
-    public function testOnKernelRequestWithRequiredFilterNotSet()
+    public function testOnKernelRequestWithRequiredFilterNotSet(): void
     {
         $request = [];
 
@@ -103,7 +103,7 @@ public function testOnKernelRequestWithRequiredFilterNotSet()
     /**
      * if the required parameter is set, no exception should be throwned.
      */
-    public function testOnKernelRequestWithRequiredFilter()
+    public function testOnKernelRequestWithRequiredFilter(): void
     {
         $request = ['required' => 'foo'];