test: apply breaking changes to HttpCache

behat.yml.dist

@@ -2,17 +2,17 @@ default:
   suites:
     default:
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -38,17 +38,17 @@ postgres:
     default: false
     postgres: &postgres-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -59,17 +59,17 @@ mongodb:
     default: false
     mongodb: &mongodb-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -82,9 +82,9 @@ elasticsearch:
       paths:
         - '%paths.base%/features/elasticsearch'
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\ElasticsearchContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\ElasticsearchContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -94,18 +94,18 @@ default-coverage:
   suites:
     default: &default-coverage-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
 
@@ -115,18 +115,18 @@ mongodb-coverage:
     mongodb: &mongodb-coverage-suite
       <<: *mongodb-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
 
@@ -136,9 +136,9 @@ elasticsearch-coverage:
     elasticsearch: &elasticsearch-coverage-suite
       <<: *elasticsearch-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\ElasticsearchContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\ElasticsearchContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\CoverageContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'

composer.json

@@ -29,7 +29,6 @@
     "require-dev": {
         "behat/behat": "^3.1",
         "behat/mink": "^1.9@dev",
-        "doctrine/annotations": "^1.7",
         "doctrine/cache": "^1.11 || ^2.1",
         "doctrine/common": "^2.11 || ^3.0",
         "doctrine/data-fixtures": "^1.2.2",
@@ -115,14 +114,10 @@
     "autoload": {
         "psr-4": {
             "ApiPlatform\\": "src/"
-        },
-        "files": [
-            "src/deprecation.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
-            "ApiPlatform\\Core\\Tests\\": "tests/Core/",
             "ApiPlatform\\Tests\\": "tests/",
             "App\\": "tests/Fixtures/app/var/tmp/src/"
         }
@@ -139,7 +134,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.7.x-dev"
+            "dev-main": "3.0.x-dev"
         },
         "symfony": {
             "require": "^3.4 || ^4.4 || ^5.1 || ^6.0"

phpunit.xml.dist

@@ -16,8 +16,6 @@
     <testsuites>
         <testsuite name="Project Test Suite">
             <directory>tests</directory>
-            <directory phpVersion="8.0" phpVersionOperator=">=">tests/Metadata/Resource/Factory</directory>
-            <exclude>tests/Metadata/Resource/Factory</exclude>
         </testsuite>
     </testsuites>
 
@@ -29,9 +27,6 @@
             <directory>features</directory>
             <directory>tests</directory>
             <directory>vendor</directory>
-            <directory>src/Core/Bridge/NelmioApiDoc</directory>
-            <directory>src/Core/Bridge/FosUser</directory>
-            <directory>src/Core/Bridge/Symfony/Maker/Resources/skeleton</directory>
             <file>.php-cs-fixer.dist.php</file>
             <file>src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php</file>
             <file>src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php</file>

src/Action/EntrypointAction.php

@@ -35,5 +35,3 @@ public function __invoke(): Entrypoint
         return new Entrypoint($this->resourceNameCollectionFactory->create());
     }
 }
-
-class_alias(EntrypointAction::class, \ApiPlatform\Core\Action\EntrypointAction::class);

src/Action/ExceptionAction.php

@@ -116,5 +116,3 @@ private function getOperationExceptionToStatus(Request $request): array
         );
     }
 }
-
-class_alias(ExceptionAction::class, \ApiPlatform\Core\Action\ExceptionAction::class);

src/Action/NotFoundAction.php

@@ -25,5 +25,3 @@ public function __invoke()
         throw new NotFoundHttpException();
     }
 }
-
-class_alias(NotFoundAction::class, \ApiPlatform\Core\Action\NotFoundAction::class);

src/Action/PlaceholderAction.php

@@ -30,5 +30,3 @@ public function __invoke($data)
         return $data;
     }
 }
-
-class_alias(PlaceholderAction::class, \ApiPlatform\Core\Action\PlaceholderAction::class);

src/Api/Entrypoint.php

@@ -34,5 +34,3 @@ public function getResourceNameCollection(): ResourceNameCollection
         return $this->resourceNameCollection;
     }
 }
-
-class_alias(Entrypoint::class, \ApiPlatform\Core\Api\Entrypoint::class);

src/Api/FilterLocatorTrait.php

@@ -62,5 +62,3 @@ private function getFilter(string $filterId): ?FilterInterface
         return null;
     }
 }
-
-class_alias(FilterLocatorTrait::class, \ApiPlatform\Core\Api\FilterLocatorTrait::class);

src/Api/FormatMatcher.php

@@ -62,5 +62,3 @@ public function getFormat(string $mimeType): ?string
         return null;
     }
 }
-
-class_alias(FormatMatcher::class, \ApiPlatform\Core\Api\FormatMatcher::class);

src/Api/QueryParameterValidator/QueryParameterValidator.php

@@ -64,5 +64,3 @@ public function validateFilters(string $resourceClass, array $resourceFilters, a
         }
     }
 }
-
-class_alias(QueryParameterValidator::class, \ApiPlatform\Core\Filter\QueryParameterValidator::class);

src/Api/QueryParameterValidator/Validator/ArrayItems.php

@@ -84,5 +84,3 @@ private static function getSeparator(string $collectionFormat): string
         }
     }
 }
-
-class_alias(ArrayItems::class, \ApiPlatform\Core\Filter\Validator\ArrayItems::class);

src/Api/QueryParameterValidator/Validator/Bounds.php

@@ -49,5 +49,3 @@ public function validate(string $name, array $filterDescription, array $queryPar
         return $errorList;
     }
 }
-
-class_alias(Bounds::class, \ApiPlatform\Core\Filter\Validator\Bounds::class);

src/Api/QueryParameterValidator/Validator/Enum.php

@@ -36,5 +36,3 @@ public function validate(string $name, array $filterDescription, array $queryPar
         return [];
     }
 }
-
-class_alias(Enum::class, \ApiPlatform\Core\Filter\Validator\Enum::class);

src/Api/QueryParameterValidator/Validator/Length.php

@@ -41,5 +41,3 @@ public function validate(string $name, array $filterDescription, array $queryPar
         return $errorList;
     }
 }
-
-class_alias(Length::class, \ApiPlatform\Core\Filter\Validator\Length::class);

src/Api/QueryParameterValidator/Validator/MultipleOf.php

@@ -36,5 +36,3 @@ public function validate(string $name, array $filterDescription, array $queryPar
         return [];
     }
 }
-
-class_alias(MultipleOf::class, \ApiPlatform\Core\Filter\Validator\MultipleOf::class);

src/Api/QueryParameterValidator/Validator/Pattern.php

@@ -36,5 +36,3 @@ public function validate(string $name, array $filterDescription, array $queryPar
         return [];
     }
 }
-
-class_alias(Pattern::class, \ApiPlatform\Core\Filter\Validator\Pattern::class);

src/Api/QueryParameterValidator/Validator/Required.php

@@ -100,5 +100,3 @@ private function requestGetQueryParameter(array $queryParameters, string $name)
         return $queryParameters[(string) $rootName];
     }
 }
-
-class_alias(Required::class, \ApiPlatform\Core\Filter\Validator\Required::class);

src/Api/ResourceClassResolver.php

@@ -109,5 +109,3 @@ public function isResourceClass(string $type): bool
         return $this->localIsResourceClassCache[$type] = false;
     }
 }
-
-class_alias(ResourceClassResolver::class, \ApiPlatform\Core\Api\ResourceClassResolver::class);