test

Author: soyuka

.github/workflows/ci.yml

@@ -140,8 +140,6 @@ jobs:
           rm -Rf tests/Fixtures/app/var/cache/*
           tests/Fixtures/app/console cache:warmup
       - name: Run PHPStan analysis
-        env:
-          SYMFONY_PHPUNIT_VERSION: '9.5'
         run: |
           ./vendor/bin/phpstan --version
           ./vendor/bin/phpstan analyse --no-interaction --no-progress --ansi
@@ -766,8 +764,6 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Update project dependencies
         run: composer update --prefer-lowest --no-interaction --no-progress --ansi
-      - name: Install PHPUnit
-        run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Run Behat tests
@@ -1031,12 +1027,10 @@ jobs:
         run: rm -Rf tests/Fixtures/app/var/cache/*
       - name: Update project dependencies
         run: composer update --prefer-lowest --no-interaction --no-progress --ansi
-      - name: Install PHPUnit
-        run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Run PHPUnit tests
-        run: vendor/bin/simple-phpunit
+        run: vendor/bin/phpunit
         env:
           SYMFONY_DEPRECATIONS_HELPER: max[self]=0&ignoreFile=./tests/.ignored-deprecations
 
@@ -1075,8 +1069,6 @@ jobs:
         run: rm -Rf tests/Fixtures/app/var/cache/*
       - name: Update project dependencies
         run: composer update --prefer-lowest --no-interaction --no-progress --ansi
-      - name: Install PHPUnit
-        run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Run Behat tests

composer.json

@@ -61,7 +61,7 @@
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "ramsey/uuid": "^3.9.7 || ^4.0",
         "ramsey/uuid-doctrine": "^1.4 || ^2.0",

src/Doctrine/Odm/State/LinksHandler.php

@@ -0,0 +1,36 @@
+<?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);
+
+namespace ApiPlatform\Doctrine\Odm\State;
+
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ODM\MongoDB\Aggregation\Builder;
+
+final class LinksHandler implements LinksHandlerInterface
+{
+    use LinksHandlerTrait {
+        handleLinks as private handle;
+    }
+
+    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory, ManagerRegistry $managerRegistry)
+    {
+        $this->resourceMetadataCollectionFactory = $resourceMetadataCollectionFactory;
+        $this->managerRegistry = $managerRegistry;
+    }
+
+    public function handleLinks(Builder $aggregationBuilder, array $uriVariables, array $context): void
+    {
+        $this->handle($aggregationBuilder, $uriVariables, $context, $context['documentClass'], $context['operation']);
+    }
+}

src/Doctrine/Odm/State/LinksHandlerInterface.php

@@ -27,7 +27,7 @@ interface LinksHandlerInterface
      * @see LinksHandlerTrait
      *
      * @param array<string, mixed>                                                  $uriVariables
-     * @param array{entityClass: string, operation: Operation}&array<string, mixed> $context
+     * @param array{documentClass: string, operation: Operation}&array<string, mixed> $context
      */
     public function handleLinks(Builder $aggregationBuilder, array $uriVariables, array $context): void;
 }

tests/Symfony/Validator/ValidationExceptionListenerTest.php renamed to tests/Symfony/Validator/EventListener/ValidationExceptionListenerTest.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Symfony\Validator;
+namespace ApiPlatform\Tests\Symfony\Validator\EventListener;
 
 use ApiPlatform\Exception\FilterValidationException;
 use ApiPlatform\Symfony\Validator\EventListener\ValidationExceptionListener;