diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index be2d368a3e2..f8a2cec0782 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -17,7 +17,7 @@ 'src/Core/Bridge/Symfony/Maker/Resources/skeleton', 'tests/Fixtures/app/var', ]) - ->notPath('src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php') + ->notPath('src/Symfony/Bundle/DependencyInjection/Configuration.php') ->notPath('src/Annotation/ApiFilter.php') // temporary ->notPath('src/Annotation/ApiProperty.php') // temporary ->notPath('src/Annotation/ApiResource.php') // temporary diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 2953ed695dd..01302b3ada4 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -11,7 +11,7 @@ parameters: bootstrapFiles: - vendor/bin/.phpunit/phpunit/vendor/autoload.php # We're aliasing classes for phpunit in this file, it needs to be added here see phpstan/#2194 - - src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubset.php + - src/Symfony/Bundle/Test/Constraint/ArraySubset.php - tests/Fixtures/app/AppKernel.php excludes_analyse: # Symfony cache @@ -21,18 +21,18 @@ parameters: - tests/Core/Bridge/NelmioApiDoc/* - src/Core/Bridge/FosUser/* # BC layer - - tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php + - tests/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php - tests/Core/Annotation/ApiResourceTest.php - tests/Core/Annotation/ApiPropertyTest.php - tests/Core/Metadata/Resource/Factory/AnnotationResourceMetadataFactoryTest.php - tests/Fixtures/TestBundle/BrowserKit/Client.php # The Symfony Configuration API isn't good enough to be analysed - - src/Core/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php + - src/Symfony/Bundle/DependencyInjection/Configuration.php # Phpstan runs on phpunit > 9, a signature changed in this file - - src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php + - src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php # Imported code (temporary) - - src/Core/Bridge/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php - - tests/Core/Bridge/Symfony/Bundle/Test/WebTestCaseTest.php + - src/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php + - tests/Symfony/Bundle/Test/WebTestCaseTest.php - tests/Core/ProphecyTrait.php - tests/Core/Behat/CoverageContext.php - tests/Fixtures/TestBundle/Security/AbstractSecurityUser.php @@ -57,11 +57,11 @@ parameters: - message: "#Parameter \\#2 \\$dqlPart of method Doctrine\\\\ORM\\\\QueryBuilder::add\\(\\) expects array<'join'\\|int, array\\|string>\\|object\\|string, array\\('o' => Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Join\\) given\\.#" paths: - - tests/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php + - tests/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php - message: '#Strict comparison using !== between .+ and .+ will always evaluate to false\.#' paths: - - src/Core/Bridge/Doctrine/Common/PropertyHelperTrait.php + - src/Doctrine/Common/PropertyHelperTrait.php - '#Access to an undefined property Prophecy\\Prophecy\\ObjectProphecy<(\\?[a-zA-Z0-9_]+)+>::\$[a-zA-Z0-9_]+#' - message: '#Call to an undefined method Doctrine\\Persistence\\ObjectManager::getConnection\(\)#' @@ -69,15 +69,15 @@ parameters: # https://github.com/willdurand/Negotiation/issues/89#issuecomment-513283286 - message: '#Call to an undefined method Negotiation\\AcceptHeader::getType\(\)\.#' - path: src/Core/EventListener/AddFormatListener.php + path: src/Symfony/EventListener/AddFormatListener.php - '#Parameter \#1 \$vars of class GraphQL\\Language\\AST\\(IntValue|ObjectField|ObjectValue|BooleanValue|ListValue|StringValue)Node constructor expects array, array given\.#' - '#Parameter \#1 \$defaultContext of class Symfony\\Component\\Serializer\\Encoder\\Json(De|En)code constructor expects array, (int|true) given\.#' - - '#Parameter \#(2|3) \$(resourceMetadataFactory|pagination) of class ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\PaginationExtension constructor expects (ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface\|Symfony\\Component\\HttpFoundation\\RequestStack|ApiPlatform\\Core\\DataProvider\\Pagination\|ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface), stdClass given\.#' + - '#Parameter \#(2|3) \$(resourceMetadataFactory|pagination) of class ApiPlatform\\Doctrine\\Orm\\Extension\\PaginationExtension constructor expects (ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface\|Symfony\\Component\\HttpFoundation\\RequestStack|ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface\|ApiPlatform\\State\\Pagination\\Pagination), stdClass given\.#' - message: '#Parameter \#[0-9] \$filterLocator of class .+ constructor expects ApiPlatform\\Core\\Api\\FilterCollection|Psr\\Container\\ContainerInterface, ArrayObject given\.#' paths: - - tests/Core/Bridge/Doctrine/Orm/Extension/FilterExtensionTest.php - - tests/Core/Hydra/Serializer/CollectionFiltersNormalizerTest.php + - tests/Doctrine/Orm/Extension/FilterExtensionTest.php + - tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php - tests/Core/Swagger/Serializer/DocumentationNormalizerV2Test.php - tests/Core/Swagger/Serializer/DocumentationNormalizerV3Test.php - @@ -85,18 +85,18 @@ parameters: path: tests/GraphQl/Type/TypeBuilderTest.php # https://github.com/phpstan/phpstan-doctrine/issues/115 - - message: '#Property ApiPlatform\\Core\\Test\\DoctrineMongoDbOdmFilterTestCase::\$repository \(Doctrine\\ODM\\MongoDB\\Repository\\DocumentRepository\) does not accept Doctrine\\ORM\\EntityRepository\.#' - path: src/Core/Test/DoctrineMongoDbOdmFilterTestCase.php + message: '#Property ApiPlatform\\Test\\DoctrineMongoDbOdmFilterTestCase::\$repository \(Doctrine\\ODM\\MongoDB\\Repository\\DocumentRepository\) does not accept Doctrine\\ORM\\EntityRepository\.#' + path: src/Test/DoctrineMongoDbOdmFilterTestCase.php - message: "#Call to method PHPUnit\\\\Framework\\\\Assert::assertSame\\(\\) with array\\('(collection_context|item_context|subresource_context)'\\) and array\\|bool\\|float\\|int\\|string\\|null will always evaluate to false\\.#" - path: tests/Core/Bridge/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php + path: tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php # https://github.com/phpstan/phpstan-phpunit/issues/62 - message: '#Call to method PHPUnit\\Framework\\Assert::assertSame\(\) with 2 and int will always evaluate to false\.#' path: tests/Core/Identifier/Normalizer/IntegerDenormalizerTest.php - message: '#Call to method PHPUnit\\Framework\\Assert::assertSame\(\) with array\(.+\) and array\(.+\) will always evaluate to false\.#' - path: tests/Core/Util/SortTraitTest.php + path: tests/Util/SortTraitTest.php # https://github.com/phpstan/phpstan-symfony/issues/76 - message: '#Service "test" is not registered in the container\.#' @@ -107,9 +107,9 @@ parameters: - '#Constructor of class ApiPlatform\\Core\\Annotation\\ApiProperty has an unused parameter#' # Expected, due to optional interfaces - - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\QueryCollectionExtensionInterface::applyToCollection\(\) invoked with 5 parameters, 3-4 required\.#' - - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\QueryResult(Item|Collection)ExtensionInterface::getResult\(\) invoked with 4 parameters, 1 required\.#' - - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\QueryResult(Item|Collection)ExtensionInterface::supportsResult\(\) invoked with 3 parameters, 1-2 required\.#' + - '#Method ApiPlatform\\Doctrine\\Orm\\Extension\\QueryCollectionExtensionInterface::applyToCollection\(\) invoked with 5 parameters, 3-4 required\.#' + - '#Method ApiPlatform\\\Doctrine\\Orm\\Extension\\QueryResult(Item|Collection)ExtensionInterface::getResult\(\) invoked with 4 parameters, 1 required\.#' + - '#Method ApiPlatform\\Doctrine\\Orm\\Extension\\QueryResult(Item|Collection)ExtensionInterface::supportsResult\(\) invoked with 3 parameters, 1-2 required\.#' - '#Method ApiPlatform\\Core\\Bridge\\Symfony\\Routing\\RouteNameResolverInterface::getRouteName\(\) invoked with 3 parameters, 2 required\.#' - '#Method ApiPlatform\\Core\\DataPersister\\DataPersisterInterface::persist\(\) invoked with 2 parameters, 1 required\.#' - '#Method ApiPlatform\\Core\\DataPersister\\DataPersisterInterface::remove\(\) invoked with 2 parameters, 1 required\.#' @@ -120,11 +120,11 @@ parameters: - '#Method Symfony\\Component\\Serializer\\Normalizer\\NormalizerInterface::supportsNormalization\(\) invoked with 3 parameters, 1-2 required\.#' # Expected, due to deprecations - - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Filter\\(Abstract|Exists|Order)Filter::filterProperty\(\) invoked with 7 parameters, 5-6 required\.#' - - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Filter\\(AbstractFilter|FilterInterface)::apply\(\) invoked with 5 parameters, 3-4 required\.#' - - '#Method ApiPlatform\\Core\\PathResolver\\OperationPathResolverInterface::resolveOperationPath\(\) invoked with 4 parameters, 3 required\.#' + - '#Method ApiPlatform\\Doctrine\\Orm\\Filter\\(Abstract|Exists|Order)Filter::filterProperty\(\) invoked with 7 parameters, 5-6 required\.#' + - '#Method ApiPlatform\\Doctrine\\Orm\\Filter\\(AbstractFilter|FilterInterface)::apply\(\) invoked with 5 parameters, 3-4 required\.#' + - '#Method ApiPlatform\\PathResolver\\OperationPathResolverInterface::resolveOperationPath\(\) invoked with 4 parameters, 3 required\.#' # Expected, due to backward compatibility - - message: "#Call to function method_exists\\(\\) with ApiPlatform\\\\Core\\\\JsonApi\\\\Serializer\\\\ItemNormalizer and 'setCircularReferenc…' will always evaluate to false\\.#" - path: tests/Core/JsonApi/Serializer/ItemNormalizerTest.php + message: "#Call to function method_exists\\(\\) with ApiPlatform\\\\JsonApi\\\\Serializer\\\\ItemNormalizer and 'setCircularReferenc…' will always evaluate to false\\.#" + path: tests/JsonApi/Serializer/ItemNormalizerTest.php diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ef2b974751d..2b95b9e4cdf 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -34,8 +34,8 @@ src/Bridge/Symfony/Maker/Resources/skeleton src/Core/Bridge/Rector .php-cs-fixer.dist.php - src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php - src/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php + src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php + src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php diff --git a/src/Core/Action/EntrypointAction.php b/src/Action/EntrypointAction.php similarity index 96% rename from src/Core/Action/EntrypointAction.php rename to src/Action/EntrypointAction.php index c1d72aad76c..b4ed13f451c 100644 --- a/src/Core/Action/EntrypointAction.php +++ b/src/Action/EntrypointAction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Action; +namespace ApiPlatform\Action; use ApiPlatform\Core\Api\Entrypoint; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; diff --git a/src/Core/Action/ExceptionAction.php b/src/Action/ExceptionAction.php similarity index 97% rename from src/Core/Action/ExceptionAction.php rename to src/Action/ExceptionAction.php index 1c029a92bd5..ac9d4106fc3 100644 --- a/src/Core/Action/ExceptionAction.php +++ b/src/Action/ExceptionAction.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Action; +namespace ApiPlatform\Action; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\ErrorFormatGuesser; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ErrorFormatGuesser; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException; use Symfony\Component\ErrorHandler\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Action/NotFoundAction.php b/src/Action/NotFoundAction.php similarity index 93% rename from src/Core/Action/NotFoundAction.php rename to src/Action/NotFoundAction.php index 8dd73fb7090..546811fee66 100644 --- a/src/Core/Action/NotFoundAction.php +++ b/src/Action/NotFoundAction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Action; +namespace ApiPlatform\Action; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Core/Action/PlaceholderAction.php b/src/Action/PlaceholderAction.php similarity index 94% rename from src/Core/Action/PlaceholderAction.php rename to src/Action/PlaceholderAction.php index 5ccc9a33616..79cc83f8371 100644 --- a/src/Core/Action/PlaceholderAction.php +++ b/src/Action/PlaceholderAction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Action; +namespace ApiPlatform\Action; /** * Placeholder returning the data passed in parameter. diff --git a/src/Api/IdentifiersExtractor.php b/src/Api/IdentifiersExtractor.php index 2a99a7528ac..5a6b1abeebf 100644 --- a/src/Api/IdentifiersExtractor.php +++ b/src/Api/IdentifiersExtractor.php @@ -15,11 +15,11 @@ use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Identifier\CompositeIdentifierParser; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; diff --git a/src/Core/Annotation/AttributesHydratorTrait.php b/src/Core/Annotation/AttributesHydratorTrait.php index df7945dc85f..00fe7481994 100644 --- a/src/Core/Annotation/AttributesHydratorTrait.php +++ b/src/Core/Annotation/AttributesHydratorTrait.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Core\Annotation; -use ApiPlatform\Core\Util\Inflector; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Util\Inflector; /** * Hydrates attributes from annotation's parameters. diff --git a/src/Core/Api/CachedIdentifiersExtractor.php b/src/Core/Api/CachedIdentifiersExtractor.php index 42b102a7cd9..13d772a4c25 100644 --- a/src/Core/Api/CachedIdentifiersExtractor.php +++ b/src/Core/Api/CachedIdentifiersExtractor.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Api; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; +use ApiPlatform\Util\ResourceClassInfoTrait; use Psr\Cache\CacheException; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\PropertyAccess\PropertyAccess; diff --git a/src/Core/Api/IdentifiersExtractor.php b/src/Core/Api/IdentifiersExtractor.php index 2a640a86cd9..765e48a9faa 100644 --- a/src/Core/Api/IdentifiersExtractor.php +++ b/src/Core/Api/IdentifiersExtractor.php @@ -16,8 +16,8 @@ use ApiPlatform\Api\IdentifiersExtractor as NewIdentifiersExtractor; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Exception\RuntimeException; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; diff --git a/src/Core/Api/ResourceClassResolver.php b/src/Core/Api/ResourceClassResolver.php index e4bc2213518..d287ad18919 100644 --- a/src/Core/Api/ResourceClassResolver.php +++ b/src/Core/Api/ResourceClassResolver.php @@ -14,8 +14,8 @@ namespace ApiPlatform\Core\Api; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Util\ClassInfoTrait; /** * {@inheritdoc} diff --git a/src/Core/Bridge/Doctrine/Common/DataPersister.php b/src/Core/Bridge/Doctrine/Common/DataPersister.php index 32d4cf7a3af..a13d92fc5f7 100644 --- a/src/Core/Bridge/Doctrine/Common/DataPersister.php +++ b/src/Core/Bridge/Doctrine/Common/DataPersister.php @@ -14,7 +14,7 @@ namespace ApiPlatform\Core\Bridge\Doctrine\Common; use ApiPlatform\Core\DataPersister\ContextAwareDataPersisterInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; +use ApiPlatform\Util\ClassInfoTrait; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProvider.php b/src/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProvider.php index d4e87a60f9a..3dd145d2f5e 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProvider.php +++ b/src/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProvider.php @@ -13,10 +13,10 @@ namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\RuntimeException; use Doctrine\ODM\MongoDB\DocumentManager; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/ItemDataProvider.php b/src/Core/Bridge/Doctrine/MongoDbOdm/ItemDataProvider.php index c2ec1864531..478b7aa1db6 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/ItemDataProvider.php +++ b/src/Core/Bridge/Doctrine/MongoDbOdm/ItemDataProvider.php @@ -14,14 +14,14 @@ namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm; use ApiPlatform\Core\Bridge\Doctrine\Common\Util\IdentifierManagerTrait; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Core\DataProvider\DenormalizedIdentifiersAwareItemDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php b/src/Core/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php index 424a7e65b78..93e5bb59ff9 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php +++ b/src/Core/Bridge/Doctrine/MongoDbOdm/SubresourceDataProvider.php @@ -14,15 +14,15 @@ namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm; use ApiPlatform\Core\Bridge\Doctrine\Common\Util\IdentifierManagerTrait; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\ResourceClassNotSupportedException; use ApiPlatform\Exception\RuntimeException; diff --git a/src/Core/Bridge/Doctrine/Orm/CollectionDataProvider.php b/src/Core/Bridge/Doctrine/Orm/CollectionDataProvider.php index b02f05bbb63..380d104f50e 100644 --- a/src/Core/Bridge/Doctrine/Orm/CollectionDataProvider.php +++ b/src/Core/Bridge/Doctrine/Orm/CollectionDataProvider.php @@ -13,11 +13,11 @@ namespace ApiPlatform\Core\Bridge\Doctrine\Orm; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\RuntimeException; use Doctrine\ORM\EntityManagerInterface; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Core/Bridge/Doctrine/Orm/ItemDataProvider.php b/src/Core/Bridge/Doctrine/Orm/ItemDataProvider.php index 5d6db54a914..4ffdded37e6 100644 --- a/src/Core/Bridge/Doctrine/Orm/ItemDataProvider.php +++ b/src/Core/Bridge/Doctrine/Orm/ItemDataProvider.php @@ -14,15 +14,15 @@ namespace ApiPlatform\Core\Bridge\Doctrine\Orm; use ApiPlatform\Core\Bridge\Doctrine\Common\Util\IdentifierManagerTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Core\DataProvider\DenormalizedIdentifiersAwareItemDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use Doctrine\ORM\EntityManagerInterface; diff --git a/src/Core/Bridge/Doctrine/Orm/SubresourceDataProvider.php b/src/Core/Bridge/Doctrine/Orm/SubresourceDataProvider.php index 4f177077e0e..2d2a9d8c209 100644 --- a/src/Core/Bridge/Doctrine/Orm/SubresourceDataProvider.php +++ b/src/Core/Bridge/Doctrine/Orm/SubresourceDataProvider.php @@ -14,16 +14,16 @@ namespace ApiPlatform\Core\Bridge\Doctrine\Orm; use ApiPlatform\Core\Bridge\Doctrine\Common\Util\IdentifierManagerTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; +use ApiPlatform\Doctrine\Orm\Extension\FilterEagerLoadingExtension; +use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\ResourceClassNotSupportedException; use ApiPlatform\Exception\RuntimeException; use Doctrine\ORM\EntityManagerInterface; diff --git a/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractor.php b/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractor.php index 55f91b5d25c..137709bd584 100644 --- a/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractor.php +++ b/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractor.php @@ -14,7 +14,7 @@ namespace ApiPlatform\Core\Bridge\Elasticsearch\Api; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; /** * {@inheritdoc} diff --git a/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractorInterface.php b/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractorInterface.php index 803319e0dc1..da0dd931fb9 100644 --- a/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractorInterface.php +++ b/src/Core/Bridge/Elasticsearch/Api/IdentifierExtractorInterface.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Bridge\Elasticsearch\Api; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; /** * Extracts identifier for a given resource. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProvider.php b/src/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProvider.php index 134e1c6a67d..879e2b87d78 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProvider.php +++ b/src/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProvider.php @@ -14,16 +14,16 @@ namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\State\Pagination\Pagination; use Elasticsearch\Client; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/ItemDataProvider.php b/src/Core/Bridge/Elasticsearch/DataProvider/ItemDataProvider.php index 702300e26b0..8eb24f51c63 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/ItemDataProvider.php +++ b/src/Core/Bridge/Elasticsearch/DataProvider/ItemDataProvider.php @@ -14,13 +14,13 @@ namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\DocumentNormalizer; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; +use ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer; use ApiPlatform\Exception\ResourceClassNotFoundException; use Elasticsearch\Client; use Elasticsearch\Common\Exceptions\Missing404Exception; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProvider.php b/src/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProvider.php index 2bb059870ef..bcb3c59ec6d 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProvider.php +++ b/src/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProvider.php @@ -14,19 +14,19 @@ namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\State\Pagination\Pagination; use Elasticsearch\Client; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/src/Core/Bridge/FosUser/EventListener.php b/src/Core/Bridge/FosUser/EventListener.php index cbc2401601e..41b77dd78a4 100644 --- a/src/Core/Bridge/FosUser/EventListener.php +++ b/src/Core/Bridge/FosUser/EventListener.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Bridge\FosUser; -use ApiPlatform\Core\Util\RequestAttributesExtractor; +use ApiPlatform\Util\RequestAttributesExtractor; use FOS\UserBundle\Model\UserInterface; use FOS\UserBundle\Model\UserManagerInterface; use Symfony\Component\HttpKernel\Event\ViewEvent; diff --git a/src/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProvider.php b/src/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProvider.php index ede9ae48dfd..03e90bbd7bd 100644 --- a/src/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProvider.php +++ b/src/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProvider.php @@ -17,10 +17,10 @@ use ApiPlatform\Core\Api\FilterLocatorTrait; use ApiPlatform\Core\Bridge\NelmioApiDoc\Parser\ApiPlatformParser; use ApiPlatform\Core\Bridge\Symfony\Routing\OperationMethodResolverInterface; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; +use ApiPlatform\Documentation\Documentation; use Nelmio\ApiDocBundle\Annotation\ApiDoc; use Nelmio\ApiDocBundle\Extractor\AnnotationsProviderInterface; use Psr\Container\ContainerInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/Action/SwaggerUiAction.php b/src/Core/Bridge/Symfony/Bundle/Action/SwaggerUiAction.php index c438402767d..07c083824fe 100644 --- a/src/Core/Bridge/Symfony/Bundle/Action/SwaggerUiAction.php +++ b/src/Core/Bridge/Symfony/Bundle/Action/SwaggerUiAction.php @@ -14,14 +14,14 @@ namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Action; use ApiPlatform\Core\Api\FormatsProviderInterface; -use ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiAction as OpenApiSwaggerUiAction; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Util\RequestAttributesExtractor; +use ApiPlatform\Documentation\Documentation; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiAction as OpenApiSwaggerUiAction; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -31,7 +31,7 @@ /** * Displays the documentation. * - * @deprecated please refer to ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiAction for further changes + * @deprecated please refer to ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiAction for further changes * * @author Kévin Dunglas */ diff --git a/src/Core/Bridge/Symfony/Bundle/Command/SwaggerCommand.php b/src/Core/Bridge/Symfony/Bundle/Command/SwaggerCommand.php index 61198eaceb5..11bc8a053d4 100644 --- a/src/Core/Bridge/Symfony/Bundle/Command/SwaggerCommand.php +++ b/src/Core/Bridge/Symfony/Bundle/Command/SwaggerCommand.php @@ -13,10 +13,10 @@ namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Command; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; -use ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; +use ApiPlatform\Documentation\Documentation; +use ApiPlatform\OpenApi\Serializer\ApiGatewayNormalizer; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Exception\InvalidOptionException; use Symfony\Component\Console\Input\InputInterface; diff --git a/src/Core/Bridge/Symfony/Messenger/DataPersister.php b/src/Core/Bridge/Symfony/Messenger/DataPersister.php index 5e8772e84fd..8dbc6fc2953 100644 --- a/src/Core/Bridge/Symfony/Messenger/DataPersister.php +++ b/src/Core/Bridge/Symfony/Messenger/DataPersister.php @@ -16,10 +16,10 @@ use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\DataPersister\ContextAwareDataPersisterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Stamp\HandledStamp; diff --git a/src/Core/Bridge/Symfony/Routing/CachedRouteNameResolver.php b/src/Core/Bridge/Symfony/Routing/CachedRouteNameResolver.php index 1b57553e92f..06d22dd313c 100644 --- a/src/Core/Bridge/Symfony/Routing/CachedRouteNameResolver.php +++ b/src/Core/Bridge/Symfony/Routing/CachedRouteNameResolver.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Bridge\Symfony\Routing; -use ApiPlatform\Core\Cache\CachedTrait; +use ApiPlatform\Util\CachedTrait; use Psr\Cache\CacheItemPoolInterface; /** diff --git a/src/Core/Bridge/Symfony/Routing/IriConverter.php b/src/Core/Bridge/Symfony/Routing/IriConverter.php index 82e60d844b4..a3c0bfc3533 100644 --- a/src/Core/Bridge/Symfony/Routing/IriConverter.php +++ b/src/Core/Bridge/Symfony/Routing/IriConverter.php @@ -27,13 +27,13 @@ use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\AttributesExtractor; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\InvalidIdentifierException; use ApiPlatform\Exception\ItemNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Symfony\Routing\IriConverter as NewIriConverter; +use ApiPlatform\Util\AttributesExtractor; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; use Symfony\Component\Routing\Exception\ExceptionInterface as RoutingExceptionInterface; diff --git a/src/Core/Bridge/Symfony/Routing/RouteNameGenerator.php b/src/Core/Bridge/Symfony/Routing/RouteNameGenerator.php index 2e0be92038e..83561cb5f65 100644 --- a/src/Core/Bridge/Symfony/Routing/RouteNameGenerator.php +++ b/src/Core/Bridge/Symfony/Routing/RouteNameGenerator.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\OperationTypeDeprecationHelper; -use ApiPlatform\Core\Util\Inflector; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Util\Inflector; /** * Generates the Symfony route name associated with an operation name and a resource short name. diff --git a/src/Core/Bridge/Symfony/Routing/RouterOperationPathResolver.php b/src/Core/Bridge/Symfony/Routing/RouterOperationPathResolver.php index 7a0fa247b71..d76245992b5 100644 --- a/src/Core/Bridge/Symfony/Routing/RouterOperationPathResolver.php +++ b/src/Core/Bridge/Symfony/Routing/RouterOperationPathResolver.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\OperationTypeDeprecationHelper; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\PathResolver\OperationPathResolverInterface; use Symfony\Component\Routing\RouterInterface; /** diff --git a/src/Core/Bridge/Symfony/Validator/EventListener/ValidateListener.php b/src/Core/Bridge/Symfony/Validator/EventListener/ValidateListener.php index c24ed58cbb0..7cb7f162fee 100644 --- a/src/Core/Bridge/Symfony/Validator/EventListener/ValidateListener.php +++ b/src/Core/Bridge/Symfony/Validator/EventListener/ValidateListener.php @@ -13,10 +13,10 @@ namespace ApiPlatform\Core\Bridge\Symfony\Validator\EventListener; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use ApiPlatform\Core\Validator\EventListener\ValidateListener as MainValidateListener; +use ApiPlatform\Symfony\EventListener\ValidateListener as MainValidateListener; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; +use ApiPlatform\Util\RequestAttributesExtractor; use Psr\Container\ContainerInterface; use Symfony\Component\HttpKernel\Event\ViewEvent; use Symfony\Component\Validator\Validator\ValidatorInterface; diff --git a/src/Core/EventListener/ReadListener.php b/src/Core/EventListener/ReadListener.php index db6ea151197..a4b1138f821 100644 --- a/src/Core/EventListener/ReadListener.php +++ b/src/Core/EventListener/ReadListener.php @@ -20,15 +20,15 @@ use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ToggleableOperationAttributeTrait; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; -use ApiPlatform\Core\Util\CloneTrait; -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use ApiPlatform\Core\Util\RequestParser; use ApiPlatform\Exception\InvalidIdentifierException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Symfony\EventListener\ReadListener as SymfonyReadListener; +use ApiPlatform\Util\CloneTrait; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; +use ApiPlatform\Util\RequestParser; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Core/EventListener/WriteListener.php b/src/Core/EventListener/WriteListener.php index 19bd12f28c4..941e4879ffe 100644 --- a/src/Core/EventListener/WriteListener.php +++ b/src/Core/EventListener/WriteListener.php @@ -19,10 +19,10 @@ use ApiPlatform\Core\DataPersister\DataPersisterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ToggleableOperationAttributeTrait; -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ViewEvent; diff --git a/src/Core/Filter/Validator/Required.php b/src/Core/Filter/Validator/Required.php index ca1ac218f17..c587e1913ba 100644 --- a/src/Core/Filter/Validator/Required.php +++ b/src/Core/Filter/Validator/Required.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Filter\Validator; -use ApiPlatform\Core\Util\RequestParser; +use ApiPlatform\Util\RequestParser; final class Required implements ValidatorInterface { diff --git a/src/Core/GraphQl/Type/FieldsBuilder.php b/src/Core/GraphQl/Type/FieldsBuilder.php index 5bffa4da654..bb520fd2780 100644 --- a/src/Core/GraphQl/Type/FieldsBuilder.php +++ b/src/Core/GraphQl/Type/FieldsBuilder.php @@ -13,18 +13,18 @@ namespace ApiPlatform\Core\GraphQl\Type; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\GraphQl\Resolver\Factory\ResolverFactoryInterface as ResolverFactoryLegacyInterface; use ApiPlatform\Core\GraphQl\Type\TypesContainerInterface as TypesContainerLegacyInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Util\Inflector; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface; use ApiPlatform\GraphQl\Type\Definition\TypeInterface; use ApiPlatform\GraphQl\Type\TypesContainerInterface; +use ApiPlatform\State\Pagination\Pagination; +use ApiPlatform\Util\Inflector; use GraphQL\Type\Definition\InputObjectType; use GraphQL\Type\Definition\NullableType; use GraphQL\Type\Definition\Type as GraphQLType; diff --git a/src/Core/GraphQl/Type/TypeBuilder.php b/src/Core/GraphQl/Type/TypeBuilder.php index 93cc3491836..70ed6e46336 100644 --- a/src/Core/GraphQl/Type/TypeBuilder.php +++ b/src/Core/GraphQl/Type/TypeBuilder.php @@ -13,11 +13,11 @@ namespace ApiPlatform\Core\GraphQl\Type; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\GraphQl\Type\TypesContainerInterface as TypesContainerLegacyInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\GraphQl\Serializer\ItemNormalizer; use ApiPlatform\GraphQl\Type\TypesContainerInterface; +use ApiPlatform\State\Pagination\Pagination; use GraphQL\Type\Definition\InputObjectType; use GraphQL\Type\Definition\InterfaceType; use GraphQL\Type\Definition\NonNull; diff --git a/src/Core/Metadata/Property/Factory/AnnotationPropertyMetadataFactory.php b/src/Core/Metadata/Property/Factory/AnnotationPropertyMetadataFactory.php index de35e71b1ab..1c8fa1ad8b2 100644 --- a/src/Core/Metadata/Property/Factory/AnnotationPropertyMetadataFactory.php +++ b/src/Core/Metadata/Property/Factory/AnnotationPropertyMetadataFactory.php @@ -15,10 +15,10 @@ use ApiPlatform\Core\Annotation\ApiProperty; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; -use ApiPlatform\Core\Util\Reflection; use ApiPlatform\Exception\PropertyNotFoundException; use ApiPlatform\Metadata\ApiProperty as ApiPropertyMetadata; use ApiPlatform\Metadata\Property\DeprecationMetadataTrait; +use ApiPlatform\Util\Reflection; use Doctrine\Common\Annotations\Reader; /** diff --git a/src/Core/Metadata/Property/Factory/AnnotationPropertyNameCollectionFactory.php b/src/Core/Metadata/Property/Factory/AnnotationPropertyNameCollectionFactory.php index 26c1eb6eb45..dfd7b2c8ddd 100644 --- a/src/Core/Metadata/Property/Factory/AnnotationPropertyNameCollectionFactory.php +++ b/src/Core/Metadata/Property/Factory/AnnotationPropertyNameCollectionFactory.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Annotation\ApiProperty; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; -use ApiPlatform\Core\Util\Reflection; use ApiPlatform\Exception\ResourceClassNotFoundException; +use ApiPlatform\Util\Reflection; use Doctrine\Common\Annotations\Reader; /** diff --git a/src/Core/Metadata/Property/Factory/AnnotationSubresourceMetadataFactory.php b/src/Core/Metadata/Property/Factory/AnnotationSubresourceMetadataFactory.php index fdc43ba91bb..98bbb9985f9 100644 --- a/src/Core/Metadata/Property/Factory/AnnotationSubresourceMetadataFactory.php +++ b/src/Core/Metadata/Property/Factory/AnnotationSubresourceMetadataFactory.php @@ -16,9 +16,9 @@ use ApiPlatform\Core\Annotation\ApiSubresource; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Property\SubresourceMetadata; -use ApiPlatform\Core\Util\Reflection; use ApiPlatform\Exception\InvalidResourceException; use ApiPlatform\Metadata\ApiProperty as ApiPropertyMetadata; +use ApiPlatform\Util\Reflection; use Doctrine\Common\Annotations\Reader; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Metadata/Resource/Factory/AnnotationResourceFilterMetadataFactory.php b/src/Core/Metadata/Resource/Factory/AnnotationResourceFilterMetadataFactory.php index ef6cf18dac4..087db558de7 100644 --- a/src/Core/Metadata/Resource/Factory/AnnotationResourceFilterMetadataFactory.php +++ b/src/Core/Metadata/Resource/Factory/AnnotationResourceFilterMetadataFactory.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Util\AnnotationFilterExtractorTrait; use ApiPlatform\Exception\ResourceClassNotFoundException; +use ApiPlatform\Util\AnnotationFilterExtractorTrait; use Doctrine\Common\Annotations\Reader; /** diff --git a/src/Core/Metadata/Resource/Factory/AnnotationResourceNameCollectionFactory.php b/src/Core/Metadata/Resource/Factory/AnnotationResourceNameCollectionFactory.php index b8554245721..c63390b249e 100644 --- a/src/Core/Metadata/Resource/Factory/AnnotationResourceNameCollectionFactory.php +++ b/src/Core/Metadata/Resource/Factory/AnnotationResourceNameCollectionFactory.php @@ -15,10 +15,10 @@ use ApiPlatform\Core\Annotation\ApiResource as ApiResourceAnnotation; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; -use ApiPlatform\Core\Util\ReflectionClassRecursiveIterator; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GraphQl\Operation as GraphQlOperation; use ApiPlatform\Metadata\Operation; +use ApiPlatform\Util\ReflectionClassRecursiveIterator; use Doctrine\Common\Annotations\Reader; /** diff --git a/src/Core/Metadata/Resource/Factory/CachedResourceMetadataFactory.php b/src/Core/Metadata/Resource/Factory/CachedResourceMetadataFactory.php index aef4d0c7ab8..1398bb2fabb 100644 --- a/src/Core/Metadata/Resource/Factory/CachedResourceMetadataFactory.php +++ b/src/Core/Metadata/Resource/Factory/CachedResourceMetadataFactory.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Core\Metadata\Resource\Factory; -use ApiPlatform\Core\Cache\CachedTrait; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; +use ApiPlatform\Util\CachedTrait; use Psr\Cache\CacheItemPoolInterface; /** diff --git a/src/Core/Metadata/Resource/Factory/CachedResourceNameCollectionFactory.php b/src/Core/Metadata/Resource/Factory/CachedResourceNameCollectionFactory.php index f5b737ff674..eb7cf21acf7 100644 --- a/src/Core/Metadata/Resource/Factory/CachedResourceNameCollectionFactory.php +++ b/src/Core/Metadata/Resource/Factory/CachedResourceNameCollectionFactory.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Core\Metadata\Resource\Factory; -use ApiPlatform\Core\Cache\CachedTrait; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; +use ApiPlatform\Util\CachedTrait; use Psr\Cache\CacheItemPoolInterface; /** diff --git a/src/Core/OpenApi/Factory/OpenApiFactory.php b/src/Core/OpenApi/Factory/OpenApiFactory.php index 702e0f2eab0..ea56a7e80bb 100644 --- a/src/Core/OpenApi/Factory/OpenApiFactory.php +++ b/src/Core/OpenApi/Factory/OpenApiFactory.php @@ -16,22 +16,23 @@ use ApiPlatform\Core\Api\FilterLocatorTrait; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Api\OperationType; -use ApiPlatform\Core\DataProvider\PaginationOptions; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\OpenApi\Model; -use ApiPlatform\Core\OpenApi\Model\ExternalDocumentation; -use ApiPlatform\Core\OpenApi\Model\PathItem; -use ApiPlatform\Core\OpenApi\OpenApi; -use ApiPlatform\Core\OpenApi\Options; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\TypeFactoryInterface; +use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface; +use ApiPlatform\OpenApi\Model; +use ApiPlatform\OpenApi\Model\ExternalDocumentation; +use ApiPlatform\OpenApi\Model\PathItem; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\OpenApi\Options; +use ApiPlatform\PathResolver\OperationPathResolverInterface; +use ApiPlatform\State\Pagination\PaginationOptions; use Psr\Container\ContainerInterface; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Operation/DashPathSegmentNameGenerator.php b/src/Core/Operation/DashPathSegmentNameGenerator.php index 1a31f1fa7fc..180b66a55ec 100644 --- a/src/Core/Operation/DashPathSegmentNameGenerator.php +++ b/src/Core/Operation/DashPathSegmentNameGenerator.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Operation; -use ApiPlatform\Core\Util\Inflector; +use ApiPlatform\Util\Inflector; /** * Generate a path name with a dash separator according to a string and whether it's a collection or not. diff --git a/src/Core/Operation/Factory/CachedSubresourceOperationFactory.php b/src/Core/Operation/Factory/CachedSubresourceOperationFactory.php index 5f58f7ef013..fa5ced37a34 100644 --- a/src/Core/Operation/Factory/CachedSubresourceOperationFactory.php +++ b/src/Core/Operation/Factory/CachedSubresourceOperationFactory.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Operation\Factory; -use ApiPlatform\Core\Cache\CachedTrait; +use ApiPlatform\Util\CachedTrait; use Psr\Cache\CacheItemPoolInterface; /** diff --git a/src/Core/Operation/UnderscorePathSegmentNameGenerator.php b/src/Core/Operation/UnderscorePathSegmentNameGenerator.php index c0e5694ac53..6e2477a85ea 100644 --- a/src/Core/Operation/UnderscorePathSegmentNameGenerator.php +++ b/src/Core/Operation/UnderscorePathSegmentNameGenerator.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Operation; -use ApiPlatform\Core\Util\Inflector; +use ApiPlatform\Util\Inflector; /** * Generate a path name with an underscore separator according to a string and whether it's a collection or not. diff --git a/src/Core/PathResolver/DashOperationPathResolver.php b/src/Core/PathResolver/DashOperationPathResolver.php index e600e7f3089..cd6f8d77115 100644 --- a/src/Core/PathResolver/DashOperationPathResolver.php +++ b/src/Core/PathResolver/DashOperationPathResolver.php @@ -14,6 +14,7 @@ namespace ApiPlatform\Core\PathResolver; use ApiPlatform\Core\Operation\DashPathSegmentNameGenerator; +use ApiPlatform\PathResolver\OperationPathResolverInterface; /** * Generates a path with words separated by underscores. diff --git a/src/Core/PathResolver/UnderscoreOperationPathResolver.php b/src/Core/PathResolver/UnderscoreOperationPathResolver.php index ad55c6665f0..d9d1fee4ab4 100644 --- a/src/Core/PathResolver/UnderscoreOperationPathResolver.php +++ b/src/Core/PathResolver/UnderscoreOperationPathResolver.php @@ -14,6 +14,7 @@ namespace ApiPlatform\Core\PathResolver; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; +use ApiPlatform\PathResolver\OperationPathResolverInterface; /** * Generates a path with words separated by underscores. diff --git a/src/Core/Swagger/Serializer/DocumentationNormalizer.php b/src/Core/Swagger/Serializer/DocumentationNormalizer.php index ed3c1fe125a..10731d38d7c 100644 --- a/src/Core/Swagger/Serializer/DocumentationNormalizer.php +++ b/src/Core/Swagger/Serializer/DocumentationNormalizer.php @@ -22,23 +22,23 @@ use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Documentation\Documentation; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; -use ApiPlatform\Core\JsonSchema\TypeFactory; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ApiResourceToLegacyResourceMetadataTrait; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\OpenApi\OpenApi; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; +use ApiPlatform\Documentation\Documentation; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Exception\RuntimeException; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactory; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\TypeFactory; +use ApiPlatform\JsonSchema\TypeFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\PathResolver\OperationPathResolverInterface; use Psr\Container\ContainerInterface; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; diff --git a/src/Core/DataTransformer/DataTransformerInitializerInterface.php b/src/DataTransformer/DataTransformerInitializerInterface.php similarity index 93% rename from src/Core/DataTransformer/DataTransformerInitializerInterface.php rename to src/DataTransformer/DataTransformerInitializerInterface.php index 85007c818e1..dde47366ce5 100644 --- a/src/Core/DataTransformer/DataTransformerInitializerInterface.php +++ b/src/DataTransformer/DataTransformerInitializerInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataTransformer; +namespace ApiPlatform\DataTransformer; interface DataTransformerInitializerInterface extends DataTransformerInterface { diff --git a/src/Core/DataTransformer/DataTransformerInterface.php b/src/DataTransformer/DataTransformerInterface.php similarity index 95% rename from src/Core/DataTransformer/DataTransformerInterface.php rename to src/DataTransformer/DataTransformerInterface.php index 156c0ffe437..56abe3fb5c5 100644 --- a/src/Core/DataTransformer/DataTransformerInterface.php +++ b/src/DataTransformer/DataTransformerInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataTransformer; +namespace ApiPlatform\DataTransformer; /** * Transforms a DTO or an Anonymous class to a Resource object. diff --git a/src/Core/Bridge/Doctrine/Common/Filter/BooleanFilterTrait.php b/src/Doctrine/Common/Filter/BooleanFilterTrait.php similarity index 95% rename from src/Core/Bridge/Doctrine/Common/Filter/BooleanFilterTrait.php rename to src/Doctrine/Common/Filter/BooleanFilterTrait.php index 4b4e56998a9..199dc54763d 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/BooleanFilterTrait.php +++ b/src/Doctrine/Common/Filter/BooleanFilterTrait.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; use ApiPlatform\Exception\InvalidArgumentException; use Psr\Log\LoggerInterface; diff --git a/src/Core/Bridge/Doctrine/Common/Filter/DateFilterInterface.php b/src/Doctrine/Common/Filter/DateFilterInterface.php similarity index 94% rename from src/Core/Bridge/Doctrine/Common/Filter/DateFilterInterface.php rename to src/Doctrine/Common/Filter/DateFilterInterface.php index 8ec6ebf5b77..cc748e701f9 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/DateFilterInterface.php +++ b/src/Doctrine/Common/Filter/DateFilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; /** * Interface for filtering the collection by date intervals. diff --git a/src/Core/Bridge/Doctrine/Common/Filter/DateFilterTrait.php b/src/Doctrine/Common/Filter/DateFilterTrait.php similarity index 95% rename from src/Core/Bridge/Doctrine/Common/Filter/DateFilterTrait.php rename to src/Doctrine/Common/Filter/DateFilterTrait.php index 22e7fd73544..958af548aca 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/DateFilterTrait.php +++ b/src/Doctrine/Common/Filter/DateFilterTrait.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; use ApiPlatform\Exception\InvalidArgumentException; /** diff --git a/src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterInterface.php b/src/Doctrine/Common/Filter/ExistsFilterInterface.php similarity index 90% rename from src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterInterface.php rename to src/Doctrine/Common/Filter/ExistsFilterInterface.php index 4194f4fb9e1..62d01060fbe 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterInterface.php +++ b/src/Doctrine/Common/Filter/ExistsFilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; /** * Interface for filtering the collection by whether a property value exists or not. diff --git a/src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterTrait.php b/src/Doctrine/Common/Filter/ExistsFilterTrait.php similarity index 96% rename from src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterTrait.php rename to src/Doctrine/Common/Filter/ExistsFilterTrait.php index eac7b82c6b8..41cfe4a36a0 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/ExistsFilterTrait.php +++ b/src/Doctrine/Common/Filter/ExistsFilterTrait.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; use ApiPlatform\Exception\InvalidArgumentException; use Psr\Log\LoggerInterface; diff --git a/src/Core/Bridge/Doctrine/Common/Filter/NumericFilterTrait.php b/src/Doctrine/Common/Filter/NumericFilterTrait.php similarity index 96% rename from src/Core/Bridge/Doctrine/Common/Filter/NumericFilterTrait.php rename to src/Doctrine/Common/Filter/NumericFilterTrait.php index af64eb8b1c0..5d4850d6644 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/NumericFilterTrait.php +++ b/src/Doctrine/Common/Filter/NumericFilterTrait.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; use ApiPlatform\Exception\InvalidArgumentException; use Psr\Log\LoggerInterface; diff --git a/src/Core/Bridge/Doctrine/Common/Filter/OrderFilterInterface.php b/src/Doctrine/Common/Filter/OrderFilterInterface.php similarity index 95% rename from src/Core/Bridge/Doctrine/Common/Filter/OrderFilterInterface.php rename to src/Doctrine/Common/Filter/OrderFilterInterface.php index d348c10bd02..b83333656cf 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/OrderFilterInterface.php +++ b/src/Doctrine/Common/Filter/OrderFilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; /** * Interface for ordering the collection by given properties. diff --git a/src/Core/Bridge/Doctrine/Common/Filter/OrderFilterTrait.php b/src/Doctrine/Common/Filter/OrderFilterTrait.php similarity index 95% rename from src/Core/Bridge/Doctrine/Common/Filter/OrderFilterTrait.php rename to src/Doctrine/Common/Filter/OrderFilterTrait.php index 207f36e5e1c..8d7ad9d302f 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/OrderFilterTrait.php +++ b/src/Doctrine/Common/Filter/OrderFilterTrait.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; /** * Trait for ordering the collection by given properties. diff --git a/src/Core/Bridge/Doctrine/Common/Filter/RangeFilterInterface.php b/src/Doctrine/Common/Filter/RangeFilterInterface.php similarity index 92% rename from src/Core/Bridge/Doctrine/Common/Filter/RangeFilterInterface.php rename to src/Doctrine/Common/Filter/RangeFilterInterface.php index 3d789fff16d..2ea0db988b3 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/RangeFilterInterface.php +++ b/src/Doctrine/Common/Filter/RangeFilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; /** * Interface for filtering the collection by range. diff --git a/src/Core/Bridge/Doctrine/Common/Filter/RangeFilterTrait.php b/src/Doctrine/Common/Filter/RangeFilterTrait.php similarity index 97% rename from src/Core/Bridge/Doctrine/Common/Filter/RangeFilterTrait.php rename to src/Doctrine/Common/Filter/RangeFilterTrait.php index d226cd21dbc..6051ac48efd 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/RangeFilterTrait.php +++ b/src/Doctrine/Common/Filter/RangeFilterTrait.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; use ApiPlatform\Exception\InvalidArgumentException; use Psr\Log\LoggerInterface; diff --git a/src/Core/Bridge/Doctrine/Common/Filter/SearchFilterInterface.php b/src/Doctrine/Common/Filter/SearchFilterInterface.php similarity index 94% rename from src/Core/Bridge/Doctrine/Common/Filter/SearchFilterInterface.php rename to src/Doctrine/Common/Filter/SearchFilterInterface.php index e80e3dc1a96..a96042cabc7 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/SearchFilterInterface.php +++ b/src/Doctrine/Common/Filter/SearchFilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; /** * Interface for filtering the collection by given properties. diff --git a/src/Core/Bridge/Doctrine/Common/Filter/SearchFilterTrait.php b/src/Doctrine/Common/Filter/SearchFilterTrait.php similarity index 97% rename from src/Core/Bridge/Doctrine/Common/Filter/SearchFilterTrait.php rename to src/Doctrine/Common/Filter/SearchFilterTrait.php index a2deec9a0fd..f2bb90dfaf0 100644 --- a/src/Core/Bridge/Doctrine/Common/Filter/SearchFilterTrait.php +++ b/src/Doctrine/Common/Filter/SearchFilterTrait.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Doctrine\Common\Filter; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; use ApiPlatform\Exception\InvalidArgumentException; use Psr\Log\LoggerInterface; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; diff --git a/src/Core/Bridge/Doctrine/Common/PropertyHelperTrait.php b/src/Doctrine/Common/PropertyHelperTrait.php similarity index 99% rename from src/Core/Bridge/Doctrine/Common/PropertyHelperTrait.php rename to src/Doctrine/Common/PropertyHelperTrait.php index 18b8c3e15e4..d54a4527639 100644 --- a/src/Core/Bridge/Doctrine/Common/PropertyHelperTrait.php +++ b/src/Doctrine/Common/PropertyHelperTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Common; +namespace ApiPlatform\Doctrine\Common; use Doctrine\DBAL\Types\Type; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Core/Bridge/Doctrine/EventListener/PublishMercureUpdatesListener.php b/src/Doctrine/EventListener/PublishMercureUpdatesListener.php similarity index 98% rename from src/Core/Bridge/Doctrine/EventListener/PublishMercureUpdatesListener.php rename to src/Doctrine/EventListener/PublishMercureUpdatesListener.php index 5b96e603134..ac43bbf6fbc 100644 --- a/src/Core/Bridge/Doctrine/EventListener/PublishMercureUpdatesListener.php +++ b/src/Doctrine/EventListener/PublishMercureUpdatesListener.php @@ -11,19 +11,19 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\EventListener; +namespace ApiPlatform\Doctrine\EventListener; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Bridge\Symfony\Messenger\DispatchTrait; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\GraphQl\Subscription\MercureSubscriptionIriGeneratorInterface as GraphQlMercureSubscriptionIriGeneratorInterface; use ApiPlatform\GraphQl\Subscription\SubscriptionManagerInterface as GraphQlSubscriptionManagerInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\Messenger\DispatchTrait; +use ApiPlatform\Util\ResourceClassInfoTrait; use Doctrine\Common\EventArgs; use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs as MongoDbOdmOnFlushEventArgs; use Doctrine\ORM\Event\OnFlushEventArgs as OrmOnFlushEventArgs; diff --git a/src/Core/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php b/src/Doctrine/EventListener/PurgeHttpCacheListener.php similarity index 98% rename from src/Core/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php rename to src/Doctrine/EventListener/PurgeHttpCacheListener.php index b4730767ab3..8fb42ad0d4e 100644 --- a/src/Core/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php +++ b/src/Doctrine/EventListener/PurgeHttpCacheListener.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\EventListener; +namespace ApiPlatform\Doctrine\EventListener; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\HttpCache\PurgerInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\RuntimeException; +use ApiPlatform\HttpCache\PurgerInterface; use Doctrine\Common\Util\ClassUtils; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Event\OnFlushEventArgs; diff --git a/src/Core/Bridge/Doctrine/EventListener/WriteListener.php b/src/Doctrine/EventListener/WriteListener.php similarity index 97% rename from src/Core/Bridge/Doctrine/EventListener/WriteListener.php rename to src/Doctrine/EventListener/WriteListener.php index fea014fbe30..808d298f34f 100644 --- a/src/Core/Bridge/Doctrine/EventListener/WriteListener.php +++ b/src/Doctrine/EventListener/WriteListener.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\EventListener; +namespace ApiPlatform\Doctrine\EventListener; use ApiPlatform\Core\EventListener\WriteListener as BaseWriteListener; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationCollectionExtensionInterface.php b/src/Doctrine/Odm/Extension/AggregationCollectionExtensionInterface.php similarity index 91% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationCollectionExtensionInterface.php rename to src/Doctrine/Odm/Extension/AggregationCollectionExtensionInterface.php index bb8cb9d8799..5a000ecc329 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationCollectionExtensionInterface.php +++ b/src/Doctrine/Odm/Extension/AggregationCollectionExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Doctrine\Odm\Extension; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationItemExtensionInterface.php b/src/Doctrine/Odm/Extension/AggregationItemExtensionInterface.php similarity index 91% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationItemExtensionInterface.php rename to src/Doctrine/Odm/Extension/AggregationItemExtensionInterface.php index 8e9b6fa9ef1..5314a685793 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationItemExtensionInterface.php +++ b/src/Doctrine/Odm/Extension/AggregationItemExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Doctrine\Odm\Extension; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationResultCollectionExtensionInterface.php b/src/Doctrine/Odm/Extension/AggregationResultCollectionExtensionInterface.php similarity index 93% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationResultCollectionExtensionInterface.php rename to src/Doctrine/Odm/Extension/AggregationResultCollectionExtensionInterface.php index f186a2d02b4..6dfb069f453 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationResultCollectionExtensionInterface.php +++ b/src/Doctrine/Odm/Extension/AggregationResultCollectionExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Doctrine\Odm\Extension; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationResultItemExtensionInterface.php b/src/Doctrine/Odm/Extension/AggregationResultItemExtensionInterface.php similarity index 93% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationResultItemExtensionInterface.php rename to src/Doctrine/Odm/Extension/AggregationResultItemExtensionInterface.php index cdef83af46b..9d483804e8c 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/AggregationResultItemExtensionInterface.php +++ b/src/Doctrine/Odm/Extension/AggregationResultItemExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Doctrine\Odm\Extension; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtension.php b/src/Doctrine/Odm/Extension/FilterExtension.php similarity index 95% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtension.php rename to src/Doctrine/Odm/Extension/FilterExtension.php index 51d50ea9e7d..9d71bf9dfc9 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtension.php +++ b/src/Doctrine/Odm/Extension/FilterExtension.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Doctrine\Odm\Extension; use ApiPlatform\Core\Api\FilterCollection; use ApiPlatform\Core\Api\FilterLocatorTrait; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\FilterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Odm\Filter\FilterInterface; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php b/src/Doctrine/Odm/Extension/OrderExtension.php similarity index 95% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php rename to src/Doctrine/Odm/Extension/OrderExtension.php index 93841fa9304..f2858a26876 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php +++ b/src/Doctrine/Odm/Extension/OrderExtension.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Doctrine\Odm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\PropertyHelperTrait as MongoDbOdmPropertyHelperTrait; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Odm\PropertyHelperTrait as MongoDbOdmPropertyHelperTrait; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtension.php b/src/Doctrine/Odm/Extension/PaginationExtension.php similarity index 97% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtension.php rename to src/Doctrine/Odm/Extension/PaginationExtension.php index a7369111574..ee69c7be4ef 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtension.php +++ b/src/Doctrine/Odm/Extension/PaginationExtension.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Doctrine\Odm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Paginator; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Odm\Paginator; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\State\Pagination\Pagination; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/AbstractFilter.php b/src/Doctrine/Odm/Filter/AbstractFilter.php similarity index 93% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/AbstractFilter.php rename to src/Doctrine/Odm/Filter/AbstractFilter.php index 483ae408715..567d9a8a1fb 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/AbstractFilter.php +++ b/src/Doctrine/Odm/Filter/AbstractFilter.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\PropertyHelperTrait as MongoDbOdmPropertyHelperTrait; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Odm\PropertyHelperTrait as MongoDbOdmPropertyHelperTrait; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\Persistence\ManagerRegistry; use Psr\Log\LoggerInterface; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilter.php b/src/Doctrine/Odm/Filter/BooleanFilter.php similarity index 93% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilter.php rename to src/Doctrine/Odm/Filter/BooleanFilter.php index 7b72bbfaec9..111760aa251 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilter.php +++ b/src/Doctrine/Odm/Filter/BooleanFilter.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\BooleanFilterTrait; +use ApiPlatform\Doctrine\Common\Filter\BooleanFilterTrait; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\ODM\MongoDB\Types\Type as MongoDbType; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/DateFilter.php b/src/Doctrine/Odm/Filter/DateFilter.php similarity index 96% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/DateFilter.php rename to src/Doctrine/Odm/Filter/DateFilter.php index 96208a0fe7c..9b64b4b4a56 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/DateFilter.php +++ b/src/Doctrine/Odm/Filter/DateFilter.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterTrait; +use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\DateFilterTrait; use ApiPlatform\Exception\InvalidArgumentException; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\ODM\MongoDB\Types\Type as MongoDbType; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilter.php b/src/Doctrine/Odm/Filter/ExistsFilter.php similarity index 94% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilter.php rename to src/Doctrine/Odm/Filter/ExistsFilter.php index d3624f8dcfe..829d60315d5 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilter.php +++ b/src/Doctrine/Odm/Filter/ExistsFilter.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterTrait; +use ApiPlatform\Doctrine\Common\Filter\ExistsFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\ExistsFilterTrait; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/FilterInterface.php b/src/Doctrine/Odm/Filter/FilterInterface.php similarity index 92% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/FilterInterface.php rename to src/Doctrine/Odm/Filter/FilterInterface.php index c5f7546e843..556a4b691f8 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/FilterInterface.php +++ b/src/Doctrine/Odm/Filter/FilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; use ApiPlatform\Core\Api\FilterInterface as BaseFilterInterface; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilter.php b/src/Doctrine/Odm/Filter/NumericFilter.php similarity index 94% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilter.php rename to src/Doctrine/Odm/Filter/NumericFilter.php index a8effa1c7de..e6766af8a98 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilter.php +++ b/src/Doctrine/Odm/Filter/NumericFilter.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\NumericFilterTrait; +use ApiPlatform\Doctrine\Common\Filter\NumericFilterTrait; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\ODM\MongoDB\Types\Type as MongoDbType; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php b/src/Doctrine/Odm/Filter/OrderFilter.php similarity index 94% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php rename to src/Doctrine/Odm/Filter/OrderFilter.php index 54b18a777f9..60c6df2f7cd 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilter.php +++ b/src/Doctrine/Odm/Filter/OrderFilter.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterTrait; +use ApiPlatform\Doctrine\Common\Filter\OrderFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\OrderFilterTrait; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\Persistence\ManagerRegistry; use Psr\Log\LoggerInterface; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilter.php b/src/Doctrine/Odm/Filter/RangeFilter.php similarity index 94% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilter.php rename to src/Doctrine/Odm/Filter/RangeFilter.php index 394bd284f79..b6c1c7d9d48 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilter.php +++ b/src/Doctrine/Odm/Filter/RangeFilter.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterTrait; +use ApiPlatform\Doctrine\Common\Filter\RangeFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\RangeFilterTrait; use Doctrine\ODM\MongoDB\Aggregation\Builder; /** diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilter.php b/src/Doctrine/Odm/Filter/SearchFilter.php similarity index 97% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilter.php rename to src/Doctrine/Odm/Filter/SearchFilter.php index 0c3d36f5f03..046217a912a 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilter.php +++ b/src/Doctrine/Odm/Filter/SearchFilter.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Doctrine\Odm\Filter; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterTrait; +use ApiPlatform\Doctrine\Common\Filter\SearchFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\SearchFilterTrait; use ApiPlatform\Exception\InvalidArgumentException; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MongoDBClassMetadata; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactory.php b/src/Doctrine/Odm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactory.php similarity index 96% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactory.php rename to src/Doctrine/Odm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactory.php index 045f00c2f8e..d29f1e4d151 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactory.php +++ b/src/Doctrine/Odm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactory.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Metadata\Property; +namespace ApiPlatform\Doctrine\Odm\Metadata\Property; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use Doctrine\ODM\MongoDB\DocumentManager; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/Paginator.php b/src/Doctrine/Odm/Paginator.php similarity index 97% rename from src/Core/Bridge/Doctrine/MongoDbOdm/Paginator.php rename to src/Doctrine/Odm/Paginator.php index 96c1b372ece..d487c724ab1 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/Paginator.php +++ b/src/Doctrine/Odm/Paginator.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm; +namespace ApiPlatform\Doctrine\Odm; -use ApiPlatform\Core\DataProvider\PaginatorInterface; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\State\Pagination\PaginatorInterface; use Doctrine\ODM\MongoDB\Iterator\Iterator; use Doctrine\ODM\MongoDB\UnitOfWork; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/PropertyHelperTrait.php b/src/Doctrine/Odm/PropertyHelperTrait.php similarity index 98% rename from src/Core/Bridge/Doctrine/MongoDbOdm/PropertyHelperTrait.php rename to src/Doctrine/Odm/PropertyHelperTrait.php index c9ce9228e5b..a185469b992 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/PropertyHelperTrait.php +++ b/src/Doctrine/Odm/PropertyHelperTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm; +namespace ApiPlatform\Doctrine\Odm; use ApiPlatform\Exception\InvalidArgumentException; use Doctrine\ODM\MongoDB\Aggregation\Builder; diff --git a/src/Core/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractor.php b/src/Doctrine/Odm/PropertyInfo/DoctrineExtractor.php similarity index 98% rename from src/Core/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractor.php rename to src/Doctrine/Odm/PropertyInfo/DoctrineExtractor.php index df673127065..511d5adb10d 100644 --- a/src/Core/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractor.php +++ b/src/Doctrine/Odm/PropertyInfo/DoctrineExtractor.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\PropertyInfo; +namespace ApiPlatform\Doctrine\Odm\PropertyInfo; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MongoDbClassMetadata; diff --git a/src/Bridge/Doctrine/Odm/State/CollectionProvider.php b/src/Doctrine/Odm/State/CollectionProvider.php similarity index 93% rename from src/Bridge/Doctrine/Odm/State/CollectionProvider.php rename to src/Doctrine/Odm/State/CollectionProvider.php index 24fa4899e14..9147d4def8f 100644 --- a/src/Bridge/Doctrine/Odm/State/CollectionProvider.php +++ b/src/Doctrine/Odm/State/CollectionProvider.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Bridge\Doctrine\Odm\State; +namespace ApiPlatform\Doctrine\Odm\State; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; diff --git a/src/Bridge/Doctrine/Odm/State/ItemProvider.php b/src/Doctrine/Odm/State/ItemProvider.php similarity index 93% rename from src/Bridge/Doctrine/Odm/State/ItemProvider.php rename to src/Doctrine/Odm/State/ItemProvider.php index c82ed6fb5e5..633cdd22cc3 100644 --- a/src/Bridge/Doctrine/Odm/State/ItemProvider.php +++ b/src/Doctrine/Odm/State/ItemProvider.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Bridge\Doctrine\Odm\State; +namespace ApiPlatform\Doctrine\Odm\State; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; diff --git a/src/Core/Bridge/Doctrine/Orm/AbstractPaginator.php b/src/Doctrine/Orm/AbstractPaginator.php similarity index 94% rename from src/Core/Bridge/Doctrine/Orm/AbstractPaginator.php rename to src/Doctrine/Orm/AbstractPaginator.php index 688e43e7084..f024925012b 100644 --- a/src/Core/Bridge/Doctrine/Orm/AbstractPaginator.php +++ b/src/Doctrine/Orm/AbstractPaginator.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm; +namespace ApiPlatform\Doctrine\Orm; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use Doctrine\ORM\Query; use Doctrine\ORM\Tools\Pagination\Paginator as DoctrinePaginator; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryCollectionExtensionInterface.php b/src/Doctrine/Orm/Extension/ContextAwareQueryCollectionExtensionInterface.php similarity index 84% rename from src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryCollectionExtensionInterface.php rename to src/Doctrine/Orm/Extension/ContextAwareQueryCollectionExtensionInterface.php index 095c678036a..abb54bf6899 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryCollectionExtensionInterface.php +++ b/src/Doctrine/Orm/Extension/ContextAwareQueryCollectionExtensionInterface.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; /** diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryResultCollectionExtensionInterface.php b/src/Doctrine/Orm/Extension/ContextAwareQueryResultCollectionExtensionInterface.php similarity index 93% rename from src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryResultCollectionExtensionInterface.php rename to src/Doctrine/Orm/Extension/ContextAwareQueryResultCollectionExtensionInterface.php index d48069fb1f5..a1dc0fa9900 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryResultCollectionExtensionInterface.php +++ b/src/Doctrine/Orm/Extension/ContextAwareQueryResultCollectionExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryResultItemExtensionInterface.php b/src/Doctrine/Orm/Extension/ContextAwareQueryResultItemExtensionInterface.php similarity index 93% rename from src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryResultItemExtensionInterface.php rename to src/Doctrine/Orm/Extension/ContextAwareQueryResultItemExtensionInterface.php index ec8f24b80cb..554563e93e6 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/ContextAwareQueryResultItemExtensionInterface.php +++ b/src/Doctrine/Orm/Extension/ContextAwareQueryResultItemExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php b/src/Doctrine/Orm/Extension/EagerLoadingExtension.php similarity index 98% rename from src/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php rename to src/Doctrine/Orm/Extension/EagerLoadingExtension.php index 749997fd1e2..c53d184788a 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php +++ b/src/Doctrine/Orm/Extension/EagerLoadingExtension.php @@ -11,16 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\EagerLoadingTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; +use ApiPlatform\Doctrine\Orm\Util\EagerLoadingTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Exception\PropertyNotFoundException; @@ -28,6 +27,7 @@ use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Query\Expr\Join; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php b/src/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php similarity index 97% rename from src/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php rename to src/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php index 31eff631ed9..1b0a1d57ca0 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php +++ b/src/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\EagerLoadingTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Orm\Util\EagerLoadingTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\GraphQl\Operation as GraphQlOperation; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/FilterExtension.php b/src/Doctrine/Orm/Extension/FilterExtension.php similarity index 94% rename from src/Core/Bridge/Doctrine/Orm/Extension/FilterExtension.php rename to src/Doctrine/Orm/Extension/FilterExtension.php index 11a90b96f7e..6676298e3c3 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/FilterExtension.php +++ b/src/Doctrine/Orm/Extension/FilterExtension.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; use ApiPlatform\Core\Api\FilterCollection; use ApiPlatform\Core\Api\FilterLocatorTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\FilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; +use ApiPlatform\Doctrine\Orm\Filter\FilterInterface; +use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/OrderExtension.php b/src/Doctrine/Orm/Extension/OrderExtension.php similarity index 95% rename from src/Core/Bridge/Doctrine/Orm/Extension/OrderExtension.php rename to src/Doctrine/Orm/Extension/OrderExtension.php index c4b054aff15..ed96898b341 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/OrderExtension.php +++ b/src/Doctrine/Orm/Extension/OrderExtension.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/PaginationExtension.php b/src/Doctrine/Orm/Extension/PaginationExtension.php similarity index 98% rename from src/Core/Bridge/Doctrine/Orm/Extension/PaginationExtension.php rename to src/Doctrine/Orm/Extension/PaginationExtension.php index 27c4a741c2b..c648dce39f0 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/PaginationExtension.php +++ b/src/Doctrine/Orm/Extension/PaginationExtension.php @@ -11,19 +11,19 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\AbstractPaginator; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; +use ApiPlatform\Doctrine\Orm\AbstractPaginator; +use ApiPlatform\Doctrine\Orm\Paginator; +use ApiPlatform\Doctrine\Orm\Util\QueryChecker; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\State\Pagination\Pagination; use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\Tools\Pagination\CountWalker; use Doctrine\ORM\Tools\Pagination\Paginator as DoctrineOrmPaginator; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/QueryCollectionExtensionInterface.php b/src/Doctrine/Orm/Extension/QueryCollectionExtensionInterface.php similarity index 83% rename from src/Core/Bridge/Doctrine/Orm/Extension/QueryCollectionExtensionInterface.php rename to src/Doctrine/Orm/Extension/QueryCollectionExtensionInterface.php index 5174fd50010..4d7c58447c1 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/QueryCollectionExtensionInterface.php +++ b/src/Doctrine/Orm/Extension/QueryCollectionExtensionInterface.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; /** diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/QueryItemExtensionInterface.php b/src/Doctrine/Orm/Extension/QueryItemExtensionInterface.php similarity index 84% rename from src/Core/Bridge/Doctrine/Orm/Extension/QueryItemExtensionInterface.php rename to src/Doctrine/Orm/Extension/QueryItemExtensionInterface.php index ce071fa523a..3765a9944ee 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/QueryItemExtensionInterface.php +++ b/src/Doctrine/Orm/Extension/QueryItemExtensionInterface.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; /** diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/QueryResultCollectionExtensionInterface.php b/src/Doctrine/Orm/Extension/QueryResultCollectionExtensionInterface.php similarity index 93% rename from src/Core/Bridge/Doctrine/Orm/Extension/QueryResultCollectionExtensionInterface.php rename to src/Doctrine/Orm/Extension/QueryResultCollectionExtensionInterface.php index 9f5733726c1..331bca4b122 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/QueryResultCollectionExtensionInterface.php +++ b/src/Doctrine/Orm/Extension/QueryResultCollectionExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Extension/QueryResultItemExtensionInterface.php b/src/Doctrine/Orm/Extension/QueryResultItemExtensionInterface.php similarity index 92% rename from src/Core/Bridge/Doctrine/Orm/Extension/QueryResultItemExtensionInterface.php rename to src/Doctrine/Orm/Extension/QueryResultItemExtensionInterface.php index 722627d8a3e..dad0ece3012 100644 --- a/src/Core/Bridge/Doctrine/Orm/Extension/QueryResultItemExtensionInterface.php +++ b/src/Doctrine/Orm/Extension/QueryResultItemExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Doctrine\Orm\Extension; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/AbstractContextAwareFilter.php b/src/Doctrine/Orm/Filter/AbstractContextAwareFilter.php similarity index 89% rename from src/Core/Bridge/Doctrine/Orm/Filter/AbstractContextAwareFilter.php rename to src/Doctrine/Orm/Filter/AbstractContextAwareFilter.php index 312175040cf..4385d8f5a95 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/AbstractContextAwareFilter.php +++ b/src/Doctrine/Orm/Filter/AbstractContextAwareFilter.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; abstract class AbstractContextAwareFilter extends AbstractFilter implements ContextAwareFilterInterface diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/AbstractFilter.php b/src/Doctrine/Orm/Filter/AbstractFilter.php similarity index 94% rename from src/Core/Bridge/Doctrine/Orm/Filter/AbstractFilter.php rename to src/Doctrine/Orm/Filter/AbstractFilter.php index f6501589d1e..96255b285ec 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/AbstractFilter.php +++ b/src/Doctrine/Orm/Filter/AbstractFilter.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\PropertyHelperTrait as OrmPropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; -use ApiPlatform\Core\Util\RequestParser; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\PropertyHelperTrait as OrmPropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Util\RequestParser; use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry; use Psr\Log\LoggerInterface; diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/BooleanFilter.php b/src/Doctrine/Orm/Filter/BooleanFilter.php similarity index 91% rename from src/Core/Bridge/Doctrine/Orm/Filter/BooleanFilter.php rename to src/Doctrine/Orm/Filter/BooleanFilter.php index 5db1c4b63c6..4f2bacc3257 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/BooleanFilter.php +++ b/src/Doctrine/Orm/Filter/BooleanFilter.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\BooleanFilterTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\Filter\BooleanFilterTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/ContextAwareFilterInterface.php b/src/Doctrine/Orm/Filter/ContextAwareFilterInterface.php similarity index 83% rename from src/Core/Bridge/Doctrine/Orm/Filter/ContextAwareFilterInterface.php rename to src/Doctrine/Orm/Filter/ContextAwareFilterInterface.php index a029b5d3d0a..60c0058de9e 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/ContextAwareFilterInterface.php +++ b/src/Doctrine/Orm/Filter/ContextAwareFilterInterface.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; /** diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/DateFilter.php b/src/Doctrine/Orm/Filter/DateFilter.php similarity index 95% rename from src/Core/Bridge/Doctrine/Orm/Filter/DateFilter.php rename to src/Doctrine/Orm/Filter/DateFilter.php index acd29b1f3bb..5d63a1a94e0 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/DateFilter.php +++ b/src/Doctrine/Orm/Filter/DateFilter.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\DateFilterTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\DBAL\Types\Types; diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/ExistsFilter.php b/src/Doctrine/Orm/Filter/ExistsFilter.php similarity index 95% rename from src/Core/Bridge/Doctrine/Orm/Filter/ExistsFilter.php rename to src/Doctrine/Orm/Filter/ExistsFilter.php index 24f86d31a35..c02c40cc2b3 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/ExistsFilter.php +++ b/src/Doctrine/Orm/Filter/ExistsFilter.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\Filter\ExistsFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\ExistsFilterTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/FilterInterface.php b/src/Doctrine/Orm/Filter/FilterInterface.php similarity index 84% rename from src/Core/Bridge/Doctrine/Orm/Filter/FilterInterface.php rename to src/Doctrine/Orm/Filter/FilterInterface.php index dfe2da2d041..7eb286d959e 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/FilterInterface.php +++ b/src/Doctrine/Orm/Filter/FilterInterface.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; use ApiPlatform\Core\Api\FilterInterface as BaseFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; /** diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/NumericFilter.php b/src/Doctrine/Orm/Filter/NumericFilter.php similarity index 93% rename from src/Core/Bridge/Doctrine/Orm/Filter/NumericFilter.php rename to src/Doctrine/Orm/Filter/NumericFilter.php index 41461cff7a0..f32e16f0771 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/NumericFilter.php +++ b/src/Doctrine/Orm/Filter/NumericFilter.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\NumericFilterTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\Filter\NumericFilterTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/OrderFilter.php b/src/Doctrine/Orm/Filter/OrderFilter.php similarity index 94% rename from src/Core/Bridge/Doctrine/Orm/Filter/OrderFilter.php rename to src/Doctrine/Orm/Filter/OrderFilter.php index cde61b93368..92c114e6a30 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/OrderFilter.php +++ b/src/Doctrine/Orm/Filter/OrderFilter.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\Filter\OrderFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\OrderFilterTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/RangeFilter.php b/src/Doctrine/Orm/Filter/RangeFilter.php similarity index 94% rename from src/Core/Bridge/Doctrine/Orm/Filter/RangeFilter.php rename to src/Doctrine/Orm/Filter/RangeFilter.php index ead733e20e2..e8738bb00bd 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/RangeFilter.php +++ b/src/Doctrine/Orm/Filter/RangeFilter.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\Filter\RangeFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\RangeFilterTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; /** diff --git a/src/Core/Bridge/Doctrine/Orm/Filter/SearchFilter.php b/src/Doctrine/Orm/Filter/SearchFilter.php similarity index 96% rename from src/Core/Bridge/Doctrine/Orm/Filter/SearchFilter.php rename to src/Doctrine/Orm/Filter/SearchFilter.php index 8c1f9093ea0..2bdaf40346d 100644 --- a/src/Core/Bridge/Doctrine/Orm/Filter/SearchFilter.php +++ b/src/Doctrine/Orm/Filter/SearchFilter.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Doctrine\Orm\Filter; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\Filter\SearchFilterInterface; +use ApiPlatform\Doctrine\Common\Filter\SearchFilterTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactory.php b/src/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactory.php similarity index 97% rename from src/Core/Bridge/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactory.php rename to src/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactory.php index 490eb465f93..152eb8553cf 100644 --- a/src/Core/Bridge/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactory.php +++ b/src/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactory.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Metadata\Property; +namespace ApiPlatform\Doctrine\Orm\Metadata\Property; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use Doctrine\ORM\Mapping\ClassMetadataInfo; diff --git a/src/Core/Bridge/Doctrine/Orm/Paginator.php b/src/Doctrine/Orm/Paginator.php similarity index 91% rename from src/Core/Bridge/Doctrine/Orm/Paginator.php rename to src/Doctrine/Orm/Paginator.php index 8bd7c6d7008..d97e7b9077d 100644 --- a/src/Core/Bridge/Doctrine/Orm/Paginator.php +++ b/src/Doctrine/Orm/Paginator.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm; +namespace ApiPlatform\Doctrine\Orm; -use ApiPlatform\Core\DataProvider\PaginatorInterface; +use ApiPlatform\State\Pagination\PaginatorInterface; use Doctrine\ORM\Query; /** diff --git a/src/Core/Bridge/Doctrine/Orm/PropertyHelperTrait.php b/src/Doctrine/Orm/PropertyHelperTrait.php similarity index 94% rename from src/Core/Bridge/Doctrine/Orm/PropertyHelperTrait.php rename to src/Doctrine/Orm/PropertyHelperTrait.php index af731b04b20..c535ff0e1c9 100644 --- a/src/Core/Bridge/Doctrine/Orm/PropertyHelperTrait.php +++ b/src/Doctrine/Orm/PropertyHelperTrait.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm; +namespace ApiPlatform\Doctrine\Orm; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/QueryAwareInterface.php b/src/Doctrine/Orm/QueryAwareInterface.php similarity index 92% rename from src/Core/Bridge/Doctrine/Orm/QueryAwareInterface.php rename to src/Doctrine/Orm/QueryAwareInterface.php index aa6169c43e5..f75ace8c750 100644 --- a/src/Core/Bridge/Doctrine/Orm/QueryAwareInterface.php +++ b/src/Doctrine/Orm/QueryAwareInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm; +namespace ApiPlatform\Doctrine\Orm; use Doctrine\ORM\Query; diff --git a/src/Bridge/Doctrine/Orm/State/CollectionProvider.php b/src/Doctrine/Orm/State/CollectionProvider.php similarity index 91% rename from src/Bridge/Doctrine/Orm/State/CollectionProvider.php rename to src/Doctrine/Orm/State/CollectionProvider.php index 0c5b55996eb..d497ef79cd1 100644 --- a/src/Bridge/Doctrine/Orm/State/CollectionProvider.php +++ b/src/Doctrine/Orm/State/CollectionProvider.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Bridge\Doctrine\Orm\State; +namespace ApiPlatform\Doctrine\Orm\State; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; +use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\State\ProviderInterface; diff --git a/src/Bridge/Doctrine/Orm/State/ItemProvider.php b/src/Doctrine/Orm/State/ItemProvider.php similarity index 92% rename from src/Bridge/Doctrine/Orm/State/ItemProvider.php rename to src/Doctrine/Orm/State/ItemProvider.php index f1bc3f1b369..7e2f596db32 100644 --- a/src/Bridge/Doctrine/Orm/State/ItemProvider.php +++ b/src/Doctrine/Orm/State/ItemProvider.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Bridge\Doctrine\Orm\State; +namespace ApiPlatform\Doctrine\Orm\State; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; +use ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\State\ProviderInterface; diff --git a/src/Doctrine/Orm/State/Processor.php b/src/Doctrine/Orm/State/Processor.php index b09e24c39d7..2cf5a3348a3 100644 --- a/src/Doctrine/Orm/State/Processor.php +++ b/src/Doctrine/Orm/State/Processor.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Doctrine\Orm\State; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Metadata\Operation; use ApiPlatform\State\ProcessorInterface; +use ApiPlatform\Util\ClassInfoTrait; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Bridge/Doctrine/Orm/State/UriVariablesHandlerTrait.php b/src/Doctrine/Orm/State/UriVariablesHandlerTrait.php similarity index 96% rename from src/Bridge/Doctrine/Orm/State/UriVariablesHandlerTrait.php rename to src/Doctrine/Orm/State/UriVariablesHandlerTrait.php index 99a0818c9c3..1defdeecaa1 100644 --- a/src/Bridge/Doctrine/Orm/State/UriVariablesHandlerTrait.php +++ b/src/Doctrine/Orm/State/UriVariablesHandlerTrait.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Bridge\Doctrine\Orm\State; +namespace ApiPlatform\Doctrine\Orm\State; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use Doctrine\ORM\QueryBuilder; trait UriVariablesHandlerTrait diff --git a/src/Core/Bridge/Doctrine/Orm/Util/EagerLoadingTrait.php b/src/Doctrine/Orm/Util/EagerLoadingTrait.php similarity index 98% rename from src/Core/Bridge/Doctrine/Orm/Util/EagerLoadingTrait.php rename to src/Doctrine/Orm/Util/EagerLoadingTrait.php index 4f5cf780d13..12d125fd3f4 100644 --- a/src/Core/Bridge/Doctrine/Orm/Util/EagerLoadingTrait.php +++ b/src/Doctrine/Orm/Util/EagerLoadingTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Doctrine\Orm\Util; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Exception\RuntimeException; diff --git a/src/Core/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php b/src/Doctrine/Orm/Util/QueryBuilderHelper.php similarity index 99% rename from src/Core/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php rename to src/Doctrine/Orm/Util/QueryBuilderHelper.php index b73334dffbc..d105625d8b7 100644 --- a/src/Core/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php +++ b/src/Doctrine/Orm/Util/QueryBuilderHelper.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Doctrine\Orm\Util; use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; diff --git a/src/Core/Bridge/Doctrine/Orm/Util/QueryChecker.php b/src/Doctrine/Orm/Util/QueryChecker.php similarity index 99% rename from src/Core/Bridge/Doctrine/Orm/Util/QueryChecker.php rename to src/Doctrine/Orm/Util/QueryChecker.php index faccbe42a9e..ce8dd718a5c 100644 --- a/src/Core/Bridge/Doctrine/Orm/Util/QueryChecker.php +++ b/src/Doctrine/Orm/Util/QueryChecker.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Doctrine\Orm\Util; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query\Expr\Join; diff --git a/src/Core/Bridge/Doctrine/Orm/Util/QueryJoinParser.php b/src/Doctrine/Orm/Util/QueryJoinParser.php similarity index 98% rename from src/Core/Bridge/Doctrine/Orm/Util/QueryJoinParser.php rename to src/Doctrine/Orm/Util/QueryJoinParser.php index 21418cba624..abe9bf2fd01 100644 --- a/src/Core/Bridge/Doctrine/Orm/Util/QueryJoinParser.php +++ b/src/Doctrine/Orm/Util/QueryJoinParser.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Doctrine\Orm\Util; use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\Query\Expr\OrderBy; diff --git a/src/Core/Bridge/Doctrine/Orm/Util/QueryNameGenerator.php b/src/Doctrine/Orm/Util/QueryNameGenerator.php similarity index 95% rename from src/Core/Bridge/Doctrine/Orm/Util/QueryNameGenerator.php rename to src/Doctrine/Orm/Util/QueryNameGenerator.php index e767716107b..9bf85b1581d 100644 --- a/src/Core/Bridge/Doctrine/Orm/Util/QueryNameGenerator.php +++ b/src/Doctrine/Orm/Util/QueryNameGenerator.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Doctrine\Orm\Util; /** * Utility functions for working with Doctrine ORM query. diff --git a/src/Core/Bridge/Doctrine/Orm/Util/QueryNameGeneratorInterface.php b/src/Doctrine/Orm/Util/QueryNameGeneratorInterface.php similarity index 92% rename from src/Core/Bridge/Doctrine/Orm/Util/QueryNameGeneratorInterface.php rename to src/Doctrine/Orm/Util/QueryNameGeneratorInterface.php index cbcc81f8188..b7120f3e684 100644 --- a/src/Core/Bridge/Doctrine/Orm/Util/QueryNameGeneratorInterface.php +++ b/src/Doctrine/Orm/Util/QueryNameGeneratorInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Doctrine\Orm\Util; /** * @author Amrouche Hamza diff --git a/src/Core/Documentation/Action/DocumentationAction.php b/src/Documentation/Action/DocumentationAction.php similarity index 92% rename from src/Core/Documentation/Action/DocumentationAction.php rename to src/Documentation/Action/DocumentationAction.php index 3757347f928..6d2581671e9 100644 --- a/src/Core/Documentation/Action/DocumentationAction.php +++ b/src/Documentation/Action/DocumentationAction.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Documentation\Action; +namespace ApiPlatform\Documentation\Action; use ApiPlatform\Core\Api\FormatsProviderInterface; -use ApiPlatform\Core\Documentation\Documentation; -use ApiPlatform\Core\Documentation\DocumentationInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; -use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; +use ApiPlatform\Documentation\Documentation; +use ApiPlatform\Documentation\DocumentationInterface; +use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Core/Documentation/Documentation.php b/src/Documentation/Documentation.php similarity index 97% rename from src/Core/Documentation/Documentation.php rename to src/Documentation/Documentation.php index e1f165155d2..b60ec48ee69 100644 --- a/src/Core/Documentation/Documentation.php +++ b/src/Documentation/Documentation.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Documentation; +namespace ApiPlatform\Documentation; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; diff --git a/src/Core/Documentation/DocumentationInterface.php b/src/Documentation/DocumentationInterface.php similarity index 88% rename from src/Core/Documentation/DocumentationInterface.php rename to src/Documentation/DocumentationInterface.php index 0bbea27c30c..779f1269146 100644 --- a/src/Core/Documentation/DocumentationInterface.php +++ b/src/Documentation/DocumentationInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Documentation; +namespace ApiPlatform\Documentation; /** * An API documentation. diff --git a/src/Core/Bridge/Elasticsearch/Exception/IndexNotFoundException.php b/src/Elasticsearch/Exception/IndexNotFoundException.php similarity index 89% rename from src/Core/Bridge/Elasticsearch/Exception/IndexNotFoundException.php rename to src/Elasticsearch/Exception/IndexNotFoundException.php index 771270d2483..c12ca5d6b9e 100644 --- a/src/Core/Bridge/Elasticsearch/Exception/IndexNotFoundException.php +++ b/src/Elasticsearch/Exception/IndexNotFoundException.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Exception; +namespace ApiPlatform\Elasticsearch\Exception; use ApiPlatform\Exception\ExceptionInterface; diff --git a/src/Core/Bridge/Elasticsearch/Exception/NonUniqueIdentifierException.php b/src/Elasticsearch/Exception/NonUniqueIdentifierException.php similarity index 89% rename from src/Core/Bridge/Elasticsearch/Exception/NonUniqueIdentifierException.php rename to src/Elasticsearch/Exception/NonUniqueIdentifierException.php index e1df1ece8b5..e2d007b1f70 100644 --- a/src/Core/Bridge/Elasticsearch/Exception/NonUniqueIdentifierException.php +++ b/src/Elasticsearch/Exception/NonUniqueIdentifierException.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Exception; +namespace ApiPlatform\Elasticsearch\Exception; use ApiPlatform\Exception\ExceptionInterface; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/AbstractFilterExtension.php b/src/Elasticsearch/Extension/AbstractFilterExtension.php similarity index 96% rename from src/Core/Bridge/Elasticsearch/DataProvider/Extension/AbstractFilterExtension.php rename to src/Elasticsearch/Extension/AbstractFilterExtension.php index e01d219795c..da139632bc8 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/AbstractFilterExtension.php +++ b/src/Elasticsearch/Extension/AbstractFilterExtension.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Elasticsearch\Extension; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use Psr\Container\ContainerInterface; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/ConstantScoreFilterExtension.php b/src/Elasticsearch/Extension/ConstantScoreFilterExtension.php similarity index 87% rename from src/Core/Bridge/Elasticsearch/DataProvider/Extension/ConstantScoreFilterExtension.php rename to src/Elasticsearch/Extension/ConstantScoreFilterExtension.php index 8ec9326ec7a..bb5a5819151 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/ConstantScoreFilterExtension.php +++ b/src/Elasticsearch/Extension/ConstantScoreFilterExtension.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Elasticsearch\Extension; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\ConstantScoreFilterInterface; +use ApiPlatform\Elasticsearch\Filter\ConstantScoreFilterInterface; /** * Applies filter clauses while executing a constant score query. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/RequestBodySearchCollectionExtensionInterface.php b/src/Elasticsearch/Extension/RequestBodySearchCollectionExtensionInterface.php similarity index 91% rename from src/Core/Bridge/Elasticsearch/DataProvider/Extension/RequestBodySearchCollectionExtensionInterface.php rename to src/Elasticsearch/Extension/RequestBodySearchCollectionExtensionInterface.php index a2d73cf4f21..f5b50d10d65 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/RequestBodySearchCollectionExtensionInterface.php +++ b/src/Elasticsearch/Extension/RequestBodySearchCollectionExtensionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Elasticsearch\Extension; /** * Interface of Elasticsearch request body search extensions for collection queries. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/SortExtension.php b/src/Elasticsearch/Extension/SortExtension.php similarity index 96% rename from src/Core/Bridge/Elasticsearch/DataProvider/Extension/SortExtension.php rename to src/Elasticsearch/Extension/SortExtension.php index 06ee807d54c..715fc33226c 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/SortExtension.php +++ b/src/Elasticsearch/Extension/SortExtension.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Elasticsearch\Extension; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Util\FieldDatatypeTrait; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Elasticsearch\Util\FieldDatatypeTrait; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; /** diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/SortFilterExtension.php b/src/Elasticsearch/Extension/SortFilterExtension.php similarity index 86% rename from src/Core/Bridge/Elasticsearch/DataProvider/Extension/SortFilterExtension.php rename to src/Elasticsearch/Extension/SortFilterExtension.php index a752d486ad0..84aec9efe6c 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Extension/SortFilterExtension.php +++ b/src/Elasticsearch/Extension/SortFilterExtension.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Elasticsearch\Extension; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\SortFilterInterface; +use ApiPlatform\Elasticsearch\Filter\SortFilterInterface; /** * Applies filters on the sort parameter while querying resource collection. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/AbstractFilter.php b/src/Elasticsearch/Filter/AbstractFilter.php similarity index 97% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/AbstractFilter.php rename to src/Elasticsearch/Filter/AbstractFilter.php index a4226c8b471..4649ee7d23f 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/AbstractFilter.php +++ b/src/Elasticsearch/Filter/AbstractFilter.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Util\FieldDatatypeTrait; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; +use ApiPlatform\Elasticsearch\Util\FieldDatatypeTrait; use ApiPlatform\Exception\PropertyNotFoundException; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Metadata\ApiProperty; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/AbstractSearchFilter.php b/src/Elasticsearch/Filter/AbstractSearchFilter.php similarity index 98% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/AbstractSearchFilter.php rename to src/Elasticsearch/Filter/AbstractSearchFilter.php index 56e37727ca4..104813245f2 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/AbstractSearchFilter.php +++ b/src/Elasticsearch/Filter/AbstractSearchFilter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/ConstantScoreFilterInterface.php b/src/Elasticsearch/Filter/ConstantScoreFilterInterface.php similarity index 87% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/ConstantScoreFilterInterface.php rename to src/Elasticsearch/Filter/ConstantScoreFilterInterface.php index 99dd2a1fa8d..638be2d10a8 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/ConstantScoreFilterInterface.php +++ b/src/Elasticsearch/Filter/ConstantScoreFilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; /** * Elasticsearch filter interface for a constant score query. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/FilterInterface.php b/src/Elasticsearch/Filter/FilterInterface.php similarity index 90% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/FilterInterface.php rename to src/Elasticsearch/Filter/FilterInterface.php index 67b2d40ccf9..e7fa597f1a1 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/FilterInterface.php +++ b/src/Elasticsearch/Filter/FilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; use ApiPlatform\Core\Api\FilterInterface as BaseFilterInterface; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/MatchFilter.php b/src/Elasticsearch/Filter/MatchFilter.php similarity index 94% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/MatchFilter.php rename to src/Elasticsearch/Filter/MatchFilter.php index c3d9f9a82d1..6f4f642f43a 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/MatchFilter.php +++ b/src/Elasticsearch/Filter/MatchFilter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; /** * Filter the collection by given properties using a full text query. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/OrderFilter.php b/src/Elasticsearch/Filter/OrderFilter.php similarity index 98% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/OrderFilter.php rename to src/Elasticsearch/Filter/OrderFilter.php index a1c78f3f06d..5ef99f1013c 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/OrderFilter.php +++ b/src/Elasticsearch/Filter/OrderFilter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/SortFilterInterface.php b/src/Elasticsearch/Filter/SortFilterInterface.php similarity index 86% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/SortFilterInterface.php rename to src/Elasticsearch/Filter/SortFilterInterface.php index 151fe1379f4..0434889c3ae 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/SortFilterInterface.php +++ b/src/Elasticsearch/Filter/SortFilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; /** * Elasticsearch filter interface for sorting. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/TermFilter.php b/src/Elasticsearch/Filter/TermFilter.php similarity index 94% rename from src/Core/Bridge/Elasticsearch/DataProvider/Filter/TermFilter.php rename to src/Elasticsearch/Filter/TermFilter.php index 3afc8e357dd..3cec8f7210e 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Filter/TermFilter.php +++ b/src/Elasticsearch/Filter/TermFilter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Elasticsearch\Filter; /** * Filter the collection by given properties using a term level query. diff --git a/src/Core/Bridge/Elasticsearch/Metadata/Document/DocumentMetadata.php b/src/Elasticsearch/Metadata/Document/DocumentMetadata.php similarity index 95% rename from src/Core/Bridge/Elasticsearch/Metadata/Document/DocumentMetadata.php rename to src/Elasticsearch/Metadata/Document/DocumentMetadata.php index dc2fbc650a3..c6197da4ffb 100644 --- a/src/Core/Bridge/Elasticsearch/Metadata/Document/DocumentMetadata.php +++ b/src/Elasticsearch/Metadata/Document/DocumentMetadata.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document; +namespace ApiPlatform\Elasticsearch\Metadata\Document; /** * Document metadata. diff --git a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactory.php b/src/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactory.php similarity index 91% rename from src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactory.php rename to src/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactory.php index 4897f47e1c3..3db168eef94 100644 --- a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactory.php +++ b/src/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactory.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; /** * Creates document's metadata using the attribute configuration. diff --git a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactory.php b/src/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactory.php similarity index 90% rename from src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactory.php rename to src/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactory.php index 42dc584e235..08316964138 100644 --- a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactory.php +++ b/src/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactory.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; use Psr\Cache\CacheException; use Psr\Cache\CacheItemPoolInterface; diff --git a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactory.php b/src/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactory.php similarity index 90% rename from src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactory.php rename to src/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactory.php index c7d42878e36..7b335b8561e 100644 --- a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactory.php +++ b/src/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactory.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\Inflector; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Util\Inflector; use Elasticsearch\Client; use Elasticsearch\Common\Exceptions\Missing404Exception; diff --git a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactory.php b/src/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactory.php similarity index 88% rename from src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactory.php rename to src/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactory.php index ca734f5c8bb..fb1d1da7098 100644 --- a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactory.php +++ b/src/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactory.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; /** * Creates document's metadata using the mapping configuration. diff --git a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/DocumentMetadataFactoryInterface.php b/src/Elasticsearch/Metadata/Document/Factory/DocumentMetadataFactoryInterface.php similarity index 72% rename from src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/DocumentMetadataFactoryInterface.php rename to src/Elasticsearch/Metadata/Document/Factory/DocumentMetadataFactoryInterface.php index 10b3c7dddf3..842e1c4fe06 100644 --- a/src/Core/Bridge/Elasticsearch/Metadata/Document/Factory/DocumentMetadataFactoryInterface.php +++ b/src/Elasticsearch/Metadata/Document/Factory/DocumentMetadataFactoryInterface.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; /** * Creates a document metadata value object. diff --git a/src/Core/Bridge/Elasticsearch/DataProvider/Paginator.php b/src/Elasticsearch/Paginator.php similarity index 94% rename from src/Core/Bridge/Elasticsearch/DataProvider/Paginator.php rename to src/Elasticsearch/Paginator.php index 5561ced9b4e..f04504f7e8f 100644 --- a/src/Core/Bridge/Elasticsearch/DataProvider/Paginator.php +++ b/src/Elasticsearch/Paginator.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\DataProvider; +namespace ApiPlatform\Elasticsearch; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\DocumentNormalizer; -use ApiPlatform\Core\DataProvider\PaginatorInterface; +use ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer; +use ApiPlatform\State\Pagination\PaginatorInterface; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/src/Core/Bridge/Elasticsearch/Serializer/DocumentNormalizer.php b/src/Elasticsearch/Serializer/DocumentNormalizer.php similarity index 98% rename from src/Core/Bridge/Elasticsearch/Serializer/DocumentNormalizer.php rename to src/Elasticsearch/Serializer/DocumentNormalizer.php index cf0603c546e..0fa8251eb6b 100644 --- a/src/Core/Bridge/Elasticsearch/Serializer/DocumentNormalizer.php +++ b/src/Elasticsearch/Serializer/DocumentNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Serializer; +namespace ApiPlatform\Elasticsearch\Serializer; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; diff --git a/src/Core/Bridge/Elasticsearch/Serializer/ItemNormalizer.php b/src/Elasticsearch/Serializer/ItemNormalizer.php similarity index 95% rename from src/Core/Bridge/Elasticsearch/Serializer/ItemNormalizer.php rename to src/Elasticsearch/Serializer/ItemNormalizer.php index dcefb46432d..7748d692317 100644 --- a/src/Core/Bridge/Elasticsearch/Serializer/ItemNormalizer.php +++ b/src/Elasticsearch/Serializer/ItemNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Serializer; +namespace ApiPlatform\Elasticsearch\Serializer; use Symfony\Component\Serializer\Exception\LogicException; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; @@ -21,7 +21,7 @@ use Symfony\Component\Serializer\SerializerInterface; /** - * Item normalizer decorator that prevents {@see \ApiPlatform\Core\Serializer\ItemNormalizer} + * Item normalizer decorator that prevents {@see \ApiPlatform\Serializer\ItemNormalizer} * from taking over for the {@see DocumentNormalizer::FORMAT} format because of priorities. * * @experimental diff --git a/src/Core/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php b/src/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php similarity index 96% rename from src/Core/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php rename to src/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php index d1bbfcdf50e..a408a1181ad 100644 --- a/src/Core/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php +++ b/src/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Serializer\NameConverter; +namespace ApiPlatform\Elasticsearch\Serializer\NameConverter; use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface; use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter; diff --git a/src/Core/Bridge/Elasticsearch/Util/FieldDatatypeTrait.php b/src/Elasticsearch/Util/FieldDatatypeTrait.php similarity index 98% rename from src/Core/Bridge/Elasticsearch/Util/FieldDatatypeTrait.php rename to src/Elasticsearch/Util/FieldDatatypeTrait.php index fd3692fc980..e947734c722 100644 --- a/src/Core/Bridge/Elasticsearch/Util/FieldDatatypeTrait.php +++ b/src/Elasticsearch/Util/FieldDatatypeTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Elasticsearch\Util; +namespace ApiPlatform\Elasticsearch\Util; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; diff --git a/src/GraphQl/Resolver/Factory/CollectionResolverFactory.php b/src/GraphQl/Resolver/Factory/CollectionResolverFactory.php index e7f32fa4c09..b71effe2dc0 100644 --- a/src/GraphQl/Resolver/Factory/CollectionResolverFactory.php +++ b/src/GraphQl/Resolver/Factory/CollectionResolverFactory.php @@ -13,7 +13,6 @@ namespace ApiPlatform\GraphQl\Resolver\Factory; -use ApiPlatform\Core\Util\CloneTrait; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\GraphQl\Resolver\QueryCollectionResolverInterface; use ApiPlatform\GraphQl\Resolver\Stage\ReadStageInterface; @@ -21,6 +20,7 @@ use ApiPlatform\GraphQl\Resolver\Stage\SecurityStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\SerializeStageInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\CloneTrait; use GraphQL\Type\Definition\ResolveInfo; use Psr\Container\ContainerInterface; use Symfony\Component\HttpFoundation\RequestStack; diff --git a/src/GraphQl/Resolver/Factory/ItemMutationResolverFactory.php b/src/GraphQl/Resolver/Factory/ItemMutationResolverFactory.php index 677f889e71f..6ce2473660c 100644 --- a/src/GraphQl/Resolver/Factory/ItemMutationResolverFactory.php +++ b/src/GraphQl/Resolver/Factory/ItemMutationResolverFactory.php @@ -13,8 +13,6 @@ namespace ApiPlatform\GraphQl\Resolver\Factory; -use ApiPlatform\Core\Util\ClassInfoTrait; -use ApiPlatform\Core\Util\CloneTrait; use ApiPlatform\GraphQl\Resolver\MutationResolverInterface; use ApiPlatform\GraphQl\Resolver\Stage\DeserializeStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\ReadStageInterface; @@ -25,6 +23,8 @@ use ApiPlatform\GraphQl\Resolver\Stage\ValidateStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\WriteStageInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ClassInfoTrait; +use ApiPlatform\Util\CloneTrait; use GraphQL\Type\Definition\ResolveInfo; use Psr\Container\ContainerInterface; diff --git a/src/GraphQl/Resolver/Factory/ItemResolverFactory.php b/src/GraphQl/Resolver/Factory/ItemResolverFactory.php index e85a2ba20a9..18d8b21fcef 100644 --- a/src/GraphQl/Resolver/Factory/ItemResolverFactory.php +++ b/src/GraphQl/Resolver/Factory/ItemResolverFactory.php @@ -13,14 +13,14 @@ namespace ApiPlatform\GraphQl\Resolver\Factory; -use ApiPlatform\Core\Util\ClassInfoTrait; -use ApiPlatform\Core\Util\CloneTrait; use ApiPlatform\GraphQl\Resolver\QueryItemResolverInterface; use ApiPlatform\GraphQl\Resolver\Stage\ReadStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\SecurityPostDenormalizeStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\SecurityStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\SerializeStageInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ClassInfoTrait; +use ApiPlatform\Util\CloneTrait; use GraphQL\Type\Definition\ResolveInfo; use Psr\Container\ContainerInterface; diff --git a/src/GraphQl/Resolver/Factory/ItemSubscriptionResolverFactory.php b/src/GraphQl/Resolver/Factory/ItemSubscriptionResolverFactory.php index e0529d4c565..f17dea6fa20 100644 --- a/src/GraphQl/Resolver/Factory/ItemSubscriptionResolverFactory.php +++ b/src/GraphQl/Resolver/Factory/ItemSubscriptionResolverFactory.php @@ -13,14 +13,14 @@ namespace ApiPlatform\GraphQl\Resolver\Factory; -use ApiPlatform\Core\Util\ClassInfoTrait; -use ApiPlatform\Core\Util\CloneTrait; use ApiPlatform\GraphQl\Resolver\Stage\ReadStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\SecurityStageInterface; use ApiPlatform\GraphQl\Resolver\Stage\SerializeStageInterface; use ApiPlatform\GraphQl\Subscription\MercureSubscriptionIriGeneratorInterface; use ApiPlatform\GraphQl\Subscription\SubscriptionManagerInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ClassInfoTrait; +use ApiPlatform\Util\CloneTrait; use GraphQL\Type\Definition\ResolveInfo; /** diff --git a/src/GraphQl/Resolver/ResourceFieldResolver.php b/src/GraphQl/Resolver/ResourceFieldResolver.php index e0bb726ac11..08b6bceac55 100644 --- a/src/GraphQl/Resolver/ResourceFieldResolver.php +++ b/src/GraphQl/Resolver/ResourceFieldResolver.php @@ -15,8 +15,8 @@ use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\GraphQl\Serializer\ItemNormalizer; +use ApiPlatform\Util\ClassInfoTrait; use GraphQL\Type\Definition\ResolveInfo; /** diff --git a/src/GraphQl/Resolver/Stage/ReadStage.php b/src/GraphQl/Resolver/Stage/ReadStage.php index 220f73f5f5e..d22490b431b 100644 --- a/src/GraphQl/Resolver/Stage/ReadStage.php +++ b/src/GraphQl/Resolver/Stage/ReadStage.php @@ -16,14 +16,14 @@ use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; -use ApiPlatform\Core\Util\ArrayTrait; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Exception\ItemNotFoundException; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\GraphQl\Resolver\Util\IdentifierTrait; use ApiPlatform\GraphQl\Serializer\ItemNormalizer; use ApiPlatform\GraphQl\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ArrayTrait; +use ApiPlatform\Util\ClassInfoTrait; use GraphQL\Type\Definition\ResolveInfo; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/GraphQl/Resolver/Stage/SecurityPostDenormalizeStage.php b/src/GraphQl/Resolver/Stage/SecurityPostDenormalizeStage.php index 2c79295e020..fed98ef6808 100644 --- a/src/GraphQl/Resolver/Stage/SecurityPostDenormalizeStage.php +++ b/src/GraphQl/Resolver/Stage/SecurityPostDenormalizeStage.php @@ -13,8 +13,8 @@ namespace ApiPlatform\GraphQl\Resolver\Stage; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** diff --git a/src/GraphQl/Resolver/Stage/SecurityPostValidationStage.php b/src/GraphQl/Resolver/Stage/SecurityPostValidationStage.php index 8d8caf60573..e387c03a79c 100644 --- a/src/GraphQl/Resolver/Stage/SecurityPostValidationStage.php +++ b/src/GraphQl/Resolver/Stage/SecurityPostValidationStage.php @@ -13,8 +13,8 @@ namespace ApiPlatform\GraphQl\Resolver\Stage; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** diff --git a/src/GraphQl/Resolver/Stage/SecurityStage.php b/src/GraphQl/Resolver/Stage/SecurityStage.php index 5dd5f93c62e..6c798fb3063 100644 --- a/src/GraphQl/Resolver/Stage/SecurityStage.php +++ b/src/GraphQl/Resolver/Stage/SecurityStage.php @@ -13,8 +13,8 @@ namespace ApiPlatform\GraphQl\Resolver\Stage; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** diff --git a/src/GraphQl/Resolver/Stage/SerializeStage.php b/src/GraphQl/Resolver/Stage/SerializeStage.php index efc53dfb7d8..99d04942ce9 100644 --- a/src/GraphQl/Resolver/Stage/SerializeStage.php +++ b/src/GraphQl/Resolver/Stage/SerializeStage.php @@ -13,14 +13,14 @@ namespace ApiPlatform\GraphQl\Resolver\Stage; -use ApiPlatform\Core\DataProvider\Pagination; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\GraphQl\Resolver\Util\IdentifierTrait; use ApiPlatform\GraphQl\Serializer\ItemNormalizer; use ApiPlatform\GraphQl\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\State\Pagination\Pagination; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; /** diff --git a/src/GraphQl/Resolver/Stage/ValidateStage.php b/src/GraphQl/Resolver/Stage/ValidateStage.php index 405822cea6e..e38cb1e6c83 100644 --- a/src/GraphQl/Resolver/Stage/ValidateStage.php +++ b/src/GraphQl/Resolver/Stage/ValidateStage.php @@ -13,8 +13,8 @@ namespace ApiPlatform\GraphQl\Resolver\Stage; -use ApiPlatform\Core\Validator\ValidatorInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\EventListener\ValidatorInterface; /** * Validate stage of GraphQL resolvers. diff --git a/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php b/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php index 7ff6203b91e..d8744a05d64 100644 --- a/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php +++ b/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php @@ -13,7 +13,7 @@ namespace ApiPlatform\GraphQl\Serializer\Exception; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; use GraphQL\Error\Error; use GraphQL\Error\FormattedError; use Symfony\Component\HttpFoundation\Response; diff --git a/src/GraphQl/Serializer/ItemNormalizer.php b/src/GraphQl/Serializer/ItemNormalizer.php index 79c5a92e78c..2582022ca01 100644 --- a/src/GraphQl/Serializer/ItemNormalizer.php +++ b/src/GraphQl/Serializer/ItemNormalizer.php @@ -19,10 +19,10 @@ use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; -use ApiPlatform\Core\Serializer\ItemNormalizer as BaseItemNormalizer; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\ItemNormalizer as BaseItemNormalizer; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; +use ApiPlatform\Util\ClassInfoTrait; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; diff --git a/src/GraphQl/Serializer/ObjectNormalizer.php b/src/GraphQl/Serializer/ObjectNormalizer.php index 06a10f36c48..2acbf499a70 100644 --- a/src/GraphQl/Serializer/ObjectNormalizer.php +++ b/src/GraphQl/Serializer/ObjectNormalizer.php @@ -16,7 +16,7 @@ use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\Serializer\Exception\UnexpectedValueException; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/GraphQl/Subscription/SubscriptionManager.php b/src/GraphQl/Subscription/SubscriptionManager.php index 6747d3830e0..c979d63a1fb 100644 --- a/src/GraphQl/Subscription/SubscriptionManager.php +++ b/src/GraphQl/Subscription/SubscriptionManager.php @@ -14,10 +14,10 @@ namespace ApiPlatform\GraphQl\Subscription; use ApiPlatform\Api\IriConverterInterface; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; -use ApiPlatform\Core\Util\SortTrait; use ApiPlatform\GraphQl\Resolver\Stage\SerializeStageInterface; use ApiPlatform\GraphQl\Resolver\Util\IdentifierTrait; +use ApiPlatform\Util\ResourceClassInfoTrait; +use ApiPlatform\Util\SortTrait; use GraphQL\Type\Definition\ResolveInfo; use Psr\Cache\CacheItemPoolInterface; diff --git a/src/GraphQl/Type/FieldsBuilder.php b/src/GraphQl/Type/FieldsBuilder.php index e8ae958809c..82d7331e021 100644 --- a/src/GraphQl/Type/FieldsBuilder.php +++ b/src/GraphQl/Type/FieldsBuilder.php @@ -13,8 +13,6 @@ namespace ApiPlatform\GraphQl\Type; -use ApiPlatform\Core\DataProvider\Pagination; -use ApiPlatform\Core\Util\Inflector; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface; use ApiPlatform\GraphQl\Type\Definition\TypeInterface; @@ -25,6 +23,8 @@ use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\State\Pagination\Pagination; +use ApiPlatform\Util\Inflector; use GraphQL\Type\Definition\InputObjectType; use GraphQL\Type\Definition\NullableType; use GraphQL\Type\Definition\Type as GraphQLType; diff --git a/src/GraphQl/Type/TypeBuilder.php b/src/GraphQl/Type/TypeBuilder.php index 88dc0582065..53760e71bbf 100644 --- a/src/GraphQl/Type/TypeBuilder.php +++ b/src/GraphQl/Type/TypeBuilder.php @@ -13,7 +13,6 @@ namespace ApiPlatform\GraphQl\Type; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\GraphQl\Serializer\ItemNormalizer; use ApiPlatform\Metadata\GraphQl\Mutation; @@ -21,6 +20,7 @@ use ApiPlatform\Metadata\GraphQl\Query; use ApiPlatform\Metadata\GraphQl\Subscription; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\State\Pagination\Pagination; use GraphQL\Type\Definition\InputObjectType; use GraphQL\Type\Definition\InterfaceType; use GraphQL\Type\Definition\NonNull; diff --git a/src/Core/Hal/JsonSchema/SchemaFactory.php b/src/Hal/JsonSchema/SchemaFactory.php similarity index 96% rename from src/Core/Hal/JsonSchema/SchemaFactory.php rename to src/Hal/JsonSchema/SchemaFactory.php index 4b74f503eeb..2d6dddf1473 100644 --- a/src/Core/Hal/JsonSchema/SchemaFactory.php +++ b/src/Hal/JsonSchema/SchemaFactory.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hal\JsonSchema; +namespace ApiPlatform\Hal\JsonSchema; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; /** * Decorator factory which adds HAL properties to the JSON Schema document. diff --git a/src/Core/Hal/Serializer/CollectionNormalizer.php b/src/Hal/Serializer/CollectionNormalizer.php similarity index 96% rename from src/Core/Hal/Serializer/CollectionNormalizer.php rename to src/Hal/Serializer/CollectionNormalizer.php index 82c13ec6121..17200ea263f 100644 --- a/src/Core/Hal/Serializer/CollectionNormalizer.php +++ b/src/Hal/Serializer/CollectionNormalizer.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hal\Serializer; +namespace ApiPlatform\Hal\Serializer; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\AbstractCollectionNormalizer; -use ApiPlatform\Core\Util\IriHelper; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Serializer\AbstractCollectionNormalizer; +use ApiPlatform\Util\IriHelper; use Symfony\Component\Serializer\Exception\UnexpectedValueException; /** diff --git a/src/Core/Hal/Serializer/EntrypointNormalizer.php b/src/Hal/Serializer/EntrypointNormalizer.php similarity index 99% rename from src/Core/Hal/Serializer/EntrypointNormalizer.php rename to src/Hal/Serializer/EntrypointNormalizer.php index 9c3f9e14d02..ed706198f24 100644 --- a/src/Core/Hal/Serializer/EntrypointNormalizer.php +++ b/src/Hal/Serializer/EntrypointNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hal\Serializer; +namespace ApiPlatform\Hal\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\Entrypoint; diff --git a/src/Core/Hal/Serializer/ItemNormalizer.php b/src/Hal/Serializer/ItemNormalizer.php similarity index 97% rename from src/Core/Hal/Serializer/ItemNormalizer.php rename to src/Hal/Serializer/ItemNormalizer.php index 8436a1d6cfb..2266481b165 100644 --- a/src/Core/Hal/Serializer/ItemNormalizer.php +++ b/src/Hal/Serializer/ItemNormalizer.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hal\Serializer; +namespace ApiPlatform\Hal\Serializer; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; -use ApiPlatform\Core\Serializer\CacheKeyTrait; -use ApiPlatform\Core\Serializer\ContextTrait; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Serializer\AbstractItemNormalizer; +use ApiPlatform\Serializer\CacheKeyTrait; +use ApiPlatform\Serializer\ContextTrait; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Serializer\Exception\LogicException; use Symfony\Component\Serializer\Exception\UnexpectedValueException; diff --git a/src/Core/Hal/Serializer/ObjectNormalizer.php b/src/Hal/Serializer/ObjectNormalizer.php similarity index 98% rename from src/Core/Hal/Serializer/ObjectNormalizer.php rename to src/Hal/Serializer/ObjectNormalizer.php index 9dc5e211f57..5cdcdd5944c 100644 --- a/src/Core/Hal/Serializer/ObjectNormalizer.php +++ b/src/Hal/Serializer/ObjectNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hal\Serializer; +namespace ApiPlatform\Hal\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; diff --git a/src/Core/HttpCache/EventListener/AddHeadersListener.php b/src/HttpCache/EventListener/AddHeadersListener.php similarity index 97% rename from src/Core/HttpCache/EventListener/AddHeadersListener.php rename to src/HttpCache/EventListener/AddHeadersListener.php index dc8fe2f49b2..cda64c9b687 100644 --- a/src/Core/HttpCache/EventListener/AddHeadersListener.php +++ b/src/HttpCache/EventListener/AddHeadersListener.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\HttpCache\EventListener; +namespace ApiPlatform\HttpCache\EventListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpKernel\Event\ResponseEvent; /** diff --git a/src/Core/HttpCache/EventListener/AddTagsListener.php b/src/HttpCache/EventListener/AddTagsListener.php similarity index 96% rename from src/Core/HttpCache/EventListener/AddTagsListener.php rename to src/HttpCache/EventListener/AddTagsListener.php index 05ad9f651ec..0e2a755864c 100644 --- a/src/Core/HttpCache/EventListener/AddTagsListener.php +++ b/src/HttpCache/EventListener/AddTagsListener.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\HttpCache\EventListener; +namespace ApiPlatform\HttpCache\EventListener; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\State\UriVariablesResolverTrait; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpKernel\Event\ResponseEvent; /** diff --git a/src/Core/HttpCache/PurgerInterface.php b/src/HttpCache/PurgerInterface.php similarity index 93% rename from src/Core/HttpCache/PurgerInterface.php rename to src/HttpCache/PurgerInterface.php index 3ef0d04726b..d950656119e 100644 --- a/src/Core/HttpCache/PurgerInterface.php +++ b/src/HttpCache/PurgerInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\HttpCache; +namespace ApiPlatform\HttpCache; /** * Purges resources from the cache. diff --git a/src/Core/HttpCache/VarnishPurger.php b/src/HttpCache/VarnishPurger.php similarity index 99% rename from src/Core/HttpCache/VarnishPurger.php rename to src/HttpCache/VarnishPurger.php index 6daa217bef4..752af98ed97 100644 --- a/src/Core/HttpCache/VarnishPurger.php +++ b/src/HttpCache/VarnishPurger.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\HttpCache; +namespace ApiPlatform\HttpCache; use GuzzleHttp\ClientInterface; diff --git a/src/Core/HttpCache/VarnishXKeyPurger.php b/src/HttpCache/VarnishXKeyPurger.php similarity index 98% rename from src/Core/HttpCache/VarnishXKeyPurger.php rename to src/HttpCache/VarnishXKeyPurger.php index d0ca74cee97..b698bb5d3a4 100644 --- a/src/Core/HttpCache/VarnishXKeyPurger.php +++ b/src/HttpCache/VarnishXKeyPurger.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\HttpCache; +namespace ApiPlatform\HttpCache; use GuzzleHttp\ClientInterface; diff --git a/src/Core/Hydra/EventListener/AddLinkHeaderListener.php b/src/Hydra/EventListener/AddLinkHeaderListener.php similarity index 92% rename from src/Core/Hydra/EventListener/AddLinkHeaderListener.php rename to src/Hydra/EventListener/AddLinkHeaderListener.php index d619939752e..ecf15d120c2 100644 --- a/src/Core/Hydra/EventListener/AddLinkHeaderListener.php +++ b/src/Hydra/EventListener/AddLinkHeaderListener.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\EventListener; +namespace ApiPlatform\Hydra\EventListener; use ApiPlatform\Api\UrlGeneratorInterface; -use ApiPlatform\Core\JsonLd\ContextBuilder; -use ApiPlatform\Core\Util\CorsTrait; +use ApiPlatform\JsonLd\ContextBuilder; +use ApiPlatform\Util\CorsTrait; use Fig\Link\GenericLinkProvider; use Fig\Link\Link; use Symfony\Component\HttpKernel\Event\ResponseEvent; diff --git a/src/Core/Hydra/JsonSchema/SchemaFactory.php b/src/Hydra/JsonSchema/SchemaFactory.php similarity index 95% rename from src/Core/Hydra/JsonSchema/SchemaFactory.php rename to src/Hydra/JsonSchema/SchemaFactory.php index 2a7445dde47..0f5397f2df8 100644 --- a/src/Core/Hydra/JsonSchema/SchemaFactory.php +++ b/src/Hydra/JsonSchema/SchemaFactory.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\JsonSchema; +namespace ApiPlatform\Hydra\JsonSchema; -use ApiPlatform\Core\JsonLd\ContextBuilder; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactory as BaseSchemaFactory; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonLd\ContextBuilder; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactory as BaseSchemaFactory; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; /** * Decorator factory which adds Hydra properties to the JSON Schema document. diff --git a/src/Core/Hydra/Serializer/CollectionFiltersNormalizer.php b/src/Hydra/Serializer/CollectionFiltersNormalizer.php similarity index 99% rename from src/Core/Hydra/Serializer/CollectionFiltersNormalizer.php rename to src/Hydra/Serializer/CollectionFiltersNormalizer.php index 67af32ea151..bff1c1e7ade 100644 --- a/src/Core/Hydra/Serializer/CollectionFiltersNormalizer.php +++ b/src/Hydra/Serializer/CollectionFiltersNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\Serializer; +namespace ApiPlatform\Hydra\Serializer; use ApiPlatform\Core\Api\FilterCollection; use ApiPlatform\Core\Api\FilterInterface; diff --git a/src/Core/Hydra/Serializer/CollectionNormalizer.php b/src/Hydra/Serializer/CollectionNormalizer.php similarity index 93% rename from src/Core/Hydra/Serializer/CollectionNormalizer.php rename to src/Hydra/Serializer/CollectionNormalizer.php index 4671a5ce06b..f133e273fcf 100644 --- a/src/Core/Hydra/Serializer/CollectionNormalizer.php +++ b/src/Hydra/Serializer/CollectionNormalizer.php @@ -11,18 +11,18 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\Serializer; +namespace ApiPlatform\Hydra\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; -use ApiPlatform\Core\JsonLd\Serializer\JsonLdContextTrait; -use ApiPlatform\Core\Serializer\ContextTrait; +use ApiPlatform\JsonLd\ContextBuilderInterface; +use ApiPlatform\JsonLd\Serializer\JsonLdContextTrait; +use ApiPlatform\Serializer\ContextTrait; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait; diff --git a/src/Core/Hydra/Serializer/ConstraintViolationListNormalizer.php b/src/Hydra/Serializer/ConstraintViolationListNormalizer.php similarity index 93% rename from src/Core/Hydra/Serializer/ConstraintViolationListNormalizer.php rename to src/Hydra/Serializer/ConstraintViolationListNormalizer.php index 19d87a899a0..48da7d1971f 100644 --- a/src/Core/Hydra/Serializer/ConstraintViolationListNormalizer.php +++ b/src/Hydra/Serializer/ConstraintViolationListNormalizer.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\Serializer; +namespace ApiPlatform\Hydra\Serializer; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Serializer\AbstractConstraintViolationListNormalizer; +use ApiPlatform\Serializer\AbstractConstraintViolationListNormalizer; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; /** diff --git a/src/Core/Hydra/Serializer/DocumentationNormalizer.php b/src/Hydra/Serializer/DocumentationNormalizer.php similarity index 99% rename from src/Core/Hydra/Serializer/DocumentationNormalizer.php rename to src/Hydra/Serializer/DocumentationNormalizer.php index cc5d3580def..5e6d2afcc7d 100644 --- a/src/Core/Hydra/Serializer/DocumentationNormalizer.php +++ b/src/Hydra/Serializer/DocumentationNormalizer.php @@ -11,14 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\Serializer; +namespace ApiPlatform\Hydra\Serializer; use ApiPlatform\Core\Api\OperationMethodResolverInterface; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Documentation\Documentation; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; @@ -26,6 +24,8 @@ use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface; +use ApiPlatform\Documentation\Documentation; +use ApiPlatform\JsonLd\ContextBuilderInterface; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Operation; diff --git a/src/Core/Hydra/Serializer/EntrypointNormalizer.php b/src/Hydra/Serializer/EntrypointNormalizer.php similarity index 99% rename from src/Core/Hydra/Serializer/EntrypointNormalizer.php rename to src/Hydra/Serializer/EntrypointNormalizer.php index 1ce358d0f50..14e1b1fc85f 100644 --- a/src/Core/Hydra/Serializer/EntrypointNormalizer.php +++ b/src/Hydra/Serializer/EntrypointNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\Serializer; +namespace ApiPlatform\Hydra\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\Entrypoint; diff --git a/src/Core/Hydra/Serializer/ErrorNormalizer.php b/src/Hydra/Serializer/ErrorNormalizer.php similarity index 98% rename from src/Core/Hydra/Serializer/ErrorNormalizer.php rename to src/Hydra/Serializer/ErrorNormalizer.php index c1a09eaf146..4d0d8e978ae 100644 --- a/src/Core/Hydra/Serializer/ErrorNormalizer.php +++ b/src/Hydra/Serializer/ErrorNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\Serializer; +namespace ApiPlatform\Hydra\Serializer; use ApiPlatform\Core\Api\UrlGeneratorInterface; use ApiPlatform\Core\Problem\Serializer\ErrorNormalizerTrait; diff --git a/src/Core/Hydra/Serializer/PartialCollectionViewNormalizer.php b/src/Hydra/Serializer/PartialCollectionViewNormalizer.php similarity index 97% rename from src/Core/Hydra/Serializer/PartialCollectionViewNormalizer.php rename to src/Hydra/Serializer/PartialCollectionViewNormalizer.php index 11c86ee6767..72c16ac7177 100644 --- a/src/Core/Hydra/Serializer/PartialCollectionViewNormalizer.php +++ b/src/Hydra/Serializer/PartialCollectionViewNormalizer.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Hydra\Serializer; +namespace ApiPlatform\Hydra\Serializer; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\IriHelper; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; +use ApiPlatform\Util\IriHelper; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; use Symfony\Component\Serializer\Exception\UnexpectedValueException; diff --git a/src/Core/JsonApi/Serializer/CollectionNormalizer.php b/src/JsonApi/Serializer/CollectionNormalizer.php similarity index 96% rename from src/Core/JsonApi/Serializer/CollectionNormalizer.php rename to src/JsonApi/Serializer/CollectionNormalizer.php index 4757332e9d3..37b299e5ca7 100644 --- a/src/Core/JsonApi/Serializer/CollectionNormalizer.php +++ b/src/JsonApi/Serializer/CollectionNormalizer.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\Serializer; +namespace ApiPlatform\JsonApi\Serializer; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\AbstractCollectionNormalizer; -use ApiPlatform\Core\Util\IriHelper; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Serializer\AbstractCollectionNormalizer; +use ApiPlatform\Util\IriHelper; use Symfony\Component\Serializer\Exception\UnexpectedValueException; /** diff --git a/src/Core/JsonApi/Serializer/ConstraintViolationListNormalizer.php b/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php similarity index 98% rename from src/Core/JsonApi/Serializer/ConstraintViolationListNormalizer.php rename to src/JsonApi/Serializer/ConstraintViolationListNormalizer.php index 7a96cc7416d..379eed30eae 100644 --- a/src/Core/JsonApi/Serializer/ConstraintViolationListNormalizer.php +++ b/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\Serializer; +namespace ApiPlatform\JsonApi\Serializer; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; diff --git a/src/Core/JsonApi/Serializer/EntrypointNormalizer.php b/src/JsonApi/Serializer/EntrypointNormalizer.php similarity index 98% rename from src/Core/JsonApi/Serializer/EntrypointNormalizer.php rename to src/JsonApi/Serializer/EntrypointNormalizer.php index 75a33ea501d..7bcc69c6adb 100644 --- a/src/Core/JsonApi/Serializer/EntrypointNormalizer.php +++ b/src/JsonApi/Serializer/EntrypointNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\Serializer; +namespace ApiPlatform\JsonApi\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\Entrypoint; diff --git a/src/Core/JsonApi/Serializer/ErrorNormalizer.php b/src/JsonApi/Serializer/ErrorNormalizer.php similarity index 97% rename from src/Core/JsonApi/Serializer/ErrorNormalizer.php rename to src/JsonApi/Serializer/ErrorNormalizer.php index 3de1fe8d903..f65102b4f9f 100644 --- a/src/Core/JsonApi/Serializer/ErrorNormalizer.php +++ b/src/JsonApi/Serializer/ErrorNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\Serializer; +namespace ApiPlatform\JsonApi\Serializer; use ApiPlatform\Core\Problem\Serializer\ErrorNormalizerTrait; use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException; diff --git a/src/Core/JsonApi/Serializer/ItemNormalizer.php b/src/JsonApi/Serializer/ItemNormalizer.php similarity index 98% rename from src/Core/JsonApi/Serializer/ItemNormalizer.php rename to src/JsonApi/Serializer/ItemNormalizer.php index e456bbcfe02..7281e6124ab 100644 --- a/src/Core/JsonApi/Serializer/ItemNormalizer.php +++ b/src/JsonApi/Serializer/ItemNormalizer.php @@ -11,20 +11,20 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\Serializer; +namespace ApiPlatform\JsonApi\Serializer; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; -use ApiPlatform\Core\Serializer\CacheKeyTrait; -use ApiPlatform\Core\Serializer\ContextTrait; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Exception\ItemNotFoundException; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Serializer\AbstractItemNormalizer; +use ApiPlatform\Serializer\CacheKeyTrait; +use ApiPlatform\Serializer\ContextTrait; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Serializer\Exception\LogicException; diff --git a/src/Core/JsonApi/Serializer/ObjectNormalizer.php b/src/JsonApi/Serializer/ObjectNormalizer.php similarity index 98% rename from src/Core/JsonApi/Serializer/ObjectNormalizer.php rename to src/JsonApi/Serializer/ObjectNormalizer.php index 8c08b03de67..9e9d1882f31 100644 --- a/src/Core/JsonApi/Serializer/ObjectNormalizer.php +++ b/src/JsonApi/Serializer/ObjectNormalizer.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\Serializer; +namespace ApiPlatform\JsonApi\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/Core/JsonApi/Serializer/ReservedAttributeNameConverter.php b/src/JsonApi/Serializer/ReservedAttributeNameConverter.php similarity index 97% rename from src/Core/JsonApi/Serializer/ReservedAttributeNameConverter.php rename to src/JsonApi/Serializer/ReservedAttributeNameConverter.php index d78fd0a22fd..750d6a76635 100644 --- a/src/Core/JsonApi/Serializer/ReservedAttributeNameConverter.php +++ b/src/JsonApi/Serializer/ReservedAttributeNameConverter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\Serializer; +namespace ApiPlatform\JsonApi\Serializer; use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; diff --git a/src/Core/JsonLd/Action/ContextAction.php b/src/JsonLd/Action/ContextAction.php similarity index 97% rename from src/Core/JsonLd/Action/ContextAction.php rename to src/JsonLd/Action/ContextAction.php index 34aefde7905..7d013cd3198 100644 --- a/src/Core/JsonLd/Action/ContextAction.php +++ b/src/JsonLd/Action/ContextAction.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonLd\Action; +namespace ApiPlatform\JsonLd\Action; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Exception\OperationNotFoundException; +use ApiPlatform\JsonLd\ContextBuilderInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Core/JsonLd/AnonymousContextBuilderInterface.php b/src/JsonLd/AnonymousContextBuilderInterface.php similarity index 95% rename from src/Core/JsonLd/AnonymousContextBuilderInterface.php rename to src/JsonLd/AnonymousContextBuilderInterface.php index 55d466aa1ef..d9bca4b0de4 100644 --- a/src/Core/JsonLd/AnonymousContextBuilderInterface.php +++ b/src/JsonLd/AnonymousContextBuilderInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonLd; +namespace ApiPlatform\JsonLd; use ApiPlatform\Core\Api\UrlGeneratorInterface; diff --git a/src/Core/JsonLd/ContextBuilder.php b/src/JsonLd/ContextBuilder.php similarity index 99% rename from src/Core/JsonLd/ContextBuilder.php rename to src/JsonLd/ContextBuilder.php index 03e95b57a1f..19e55726ebc 100644 --- a/src/Core/JsonLd/ContextBuilder.php +++ b/src/JsonLd/ContextBuilder.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonLd; +namespace ApiPlatform\JsonLd; use ApiPlatform\Core\Api\UrlGeneratorInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface; @@ -19,12 +19,12 @@ use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\Operation; use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; /** diff --git a/src/Core/JsonLd/ContextBuilderInterface.php b/src/JsonLd/ContextBuilderInterface.php similarity index 97% rename from src/Core/JsonLd/ContextBuilderInterface.php rename to src/JsonLd/ContextBuilderInterface.php index 00239a7cc06..b32699179c2 100644 --- a/src/Core/JsonLd/ContextBuilderInterface.php +++ b/src/JsonLd/ContextBuilderInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonLd; +namespace ApiPlatform\JsonLd; use ApiPlatform\Core\Api\UrlGeneratorInterface; use ApiPlatform\Exception\ResourceClassNotFoundException; diff --git a/src/Core/JsonLd/Serializer/ItemNormalizer.php b/src/JsonLd/Serializer/ItemNormalizer.php similarity index 95% rename from src/Core/JsonLd/Serializer/ItemNormalizer.php rename to src/JsonLd/Serializer/ItemNormalizer.php index e22685495d7..3997461392c 100644 --- a/src/Core/JsonLd/Serializer/ItemNormalizer.php +++ b/src/JsonLd/Serializer/ItemNormalizer.php @@ -11,20 +11,20 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonLd\Serializer; +namespace ApiPlatform\JsonLd\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; -use ApiPlatform\Core\Serializer\ContextTrait; -use ApiPlatform\Core\Util\ClassInfoTrait; +use ApiPlatform\JsonLd\ContextBuilderInterface; +use ApiPlatform\Serializer\AbstractItemNormalizer; +use ApiPlatform\Serializer\ContextTrait; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; use Symfony\Component\Serializer\Exception\LogicException; use Symfony\Component\Serializer\Exception\NotNormalizableValueException; diff --git a/src/Core/JsonLd/Serializer/JsonLdContextTrait.php b/src/JsonLd/Serializer/JsonLdContextTrait.php similarity index 91% rename from src/Core/JsonLd/Serializer/JsonLdContextTrait.php rename to src/JsonLd/Serializer/JsonLdContextTrait.php index 569c52121c9..fcbe98206c2 100644 --- a/src/Core/JsonLd/Serializer/JsonLdContextTrait.php +++ b/src/JsonLd/Serializer/JsonLdContextTrait.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonLd\Serializer; +namespace ApiPlatform\JsonLd\Serializer; -use ApiPlatform\Core\JsonLd\AnonymousContextBuilderInterface; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; +use ApiPlatform\JsonLd\AnonymousContextBuilderInterface; +use ApiPlatform\JsonLd\ContextBuilderInterface; /** * Creates and manipulates the Serializer context. diff --git a/src/Core/JsonLd/Serializer/ObjectNormalizer.php b/src/JsonLd/Serializer/ObjectNormalizer.php similarity index 97% rename from src/Core/JsonLd/Serializer/ObjectNormalizer.php rename to src/JsonLd/Serializer/ObjectNormalizer.php index b3d8b6f9283..92bc069591c 100644 --- a/src/Core/JsonLd/Serializer/ObjectNormalizer.php +++ b/src/JsonLd/Serializer/ObjectNormalizer.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonLd\Serializer; +namespace ApiPlatform\JsonLd\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; -use ApiPlatform\Core\JsonLd\AnonymousContextBuilderInterface; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\JsonLd\AnonymousContextBuilderInterface; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/Core/JsonSchema/Command/JsonSchemaGenerateCommand.php b/src/JsonSchema/Command/JsonSchemaGenerateCommand.php similarity index 96% rename from src/Core/JsonSchema/Command/JsonSchemaGenerateCommand.php rename to src/JsonSchema/Command/JsonSchemaGenerateCommand.php index 9be6a2c03d3..ed369a3c728 100644 --- a/src/Core/JsonSchema/Command/JsonSchemaGenerateCommand.php +++ b/src/JsonSchema/Command/JsonSchemaGenerateCommand.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonSchema\Command; +namespace ApiPlatform\JsonSchema\Command; use ApiPlatform\Core\Api\OperationType; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Exception\InvalidOptionException; use Symfony\Component\Console\Input\InputArgument; diff --git a/src/Core/JsonSchema/Schema.php b/src/JsonSchema/Schema.php similarity index 98% rename from src/Core/JsonSchema/Schema.php rename to src/JsonSchema/Schema.php index c744869c448..4a840bd0d38 100644 --- a/src/Core/JsonSchema/Schema.php +++ b/src/JsonSchema/Schema.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonSchema; +namespace ApiPlatform\JsonSchema; /** * Represents a JSON Schema document. diff --git a/src/Core/JsonSchema/SchemaFactory.php b/src/JsonSchema/SchemaFactory.php similarity index 99% rename from src/Core/JsonSchema/SchemaFactory.php rename to src/JsonSchema/SchemaFactory.php index 814e1b69198..820ea7a2276 100644 --- a/src/Core/JsonSchema/SchemaFactory.php +++ b/src/JsonSchema/SchemaFactory.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonSchema; +namespace ApiPlatform\JsonSchema; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; @@ -21,7 +21,6 @@ use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\Operation; use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; @@ -29,6 +28,7 @@ use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; use ApiPlatform\OpenApi\Factory\OpenApiFactory; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; diff --git a/src/Core/JsonSchema/SchemaFactoryInterface.php b/src/JsonSchema/SchemaFactoryInterface.php similarity index 95% rename from src/Core/JsonSchema/SchemaFactoryInterface.php rename to src/JsonSchema/SchemaFactoryInterface.php index 0b14048b461..6a5170f109d 100644 --- a/src/Core/JsonSchema/SchemaFactoryInterface.php +++ b/src/JsonSchema/SchemaFactoryInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonSchema; +namespace ApiPlatform\JsonSchema; /** * Factory for creating the JSON Schema document corresponding to a PHP class. diff --git a/src/Core/JsonSchema/TypeFactory.php b/src/JsonSchema/TypeFactory.php similarity index 98% rename from src/Core/JsonSchema/TypeFactory.php rename to src/JsonSchema/TypeFactory.php index 16386c72ae1..bfbf350b302 100644 --- a/src/Core/JsonSchema/TypeFactory.php +++ b/src/JsonSchema/TypeFactory.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonSchema; +namespace ApiPlatform\JsonSchema; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; +use ApiPlatform\Util\ResourceClassInfoTrait; use Ramsey\Uuid\UuidInterface; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Uid\Ulid; diff --git a/src/Core/JsonSchema/TypeFactoryInterface.php b/src/JsonSchema/TypeFactoryInterface.php similarity index 95% rename from src/Core/JsonSchema/TypeFactoryInterface.php rename to src/JsonSchema/TypeFactoryInterface.php index e9e007fe341..e3f58494c4a 100644 --- a/src/Core/JsonSchema/TypeFactoryInterface.php +++ b/src/JsonSchema/TypeFactoryInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonSchema; +namespace ApiPlatform\JsonSchema; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Metadata/ApiProperty.php b/src/Metadata/ApiProperty.php index 7802f33a8d1..529131d79f0 100644 --- a/src/Metadata/ApiProperty.php +++ b/src/Metadata/ApiProperty.php @@ -127,8 +127,8 @@ public function __construct( ?bool $required = null, ?bool $identifier = null, - $default = null, - $example = null, + $default = null, + $example = null, ?string $deprecationReason = null, ?bool $fetchable = null, diff --git a/src/Metadata/ApiResource.php b/src/Metadata/ApiResource.php index fe3531dd24f..baa1458e950 100644 --- a/src/Metadata/ApiResource.php +++ b/src/Metadata/ApiResource.php @@ -162,7 +162,7 @@ public function __construct( $formats = null, $inputFormats = null, $outputFormats = null, - $uriVariables = null, + $uriVariables = null, ?string $routePrefix = null, ?array $defaults = null, ?array $requirements = null, diff --git a/src/Metadata/Property/Factory/AttributePropertyMetadataFactory.php b/src/Metadata/Property/Factory/AttributePropertyMetadataFactory.php index 089bc188449..c802050d9cf 100644 --- a/src/Metadata/Property/Factory/AttributePropertyMetadataFactory.php +++ b/src/Metadata/Property/Factory/AttributePropertyMetadataFactory.php @@ -14,9 +14,9 @@ namespace ApiPlatform\Metadata\Property\Factory; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; -use ApiPlatform\Core\Util\Reflection; use ApiPlatform\Exception\PropertyNotFoundException; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Util\Reflection; /** * Creates a property metadata from {@see ApiProperty} attribute. diff --git a/src/Metadata/Property/Factory/CachedPropertyMetadataFactory.php b/src/Metadata/Property/Factory/CachedPropertyMetadataFactory.php index cd58d08e6ed..189caf77738 100644 --- a/src/Metadata/Property/Factory/CachedPropertyMetadataFactory.php +++ b/src/Metadata/Property/Factory/CachedPropertyMetadataFactory.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Metadata\Property\Factory; -use ApiPlatform\Core\Cache\CachedTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Util\CachedTrait; use Psr\Cache\CacheItemPoolInterface; /** diff --git a/src/Metadata/Property/Factory/CachedPropertyNameCollectionFactory.php b/src/Metadata/Property/Factory/CachedPropertyNameCollectionFactory.php index 6ff43d509b0..58884ea4821 100644 --- a/src/Metadata/Property/Factory/CachedPropertyNameCollectionFactory.php +++ b/src/Metadata/Property/Factory/CachedPropertyNameCollectionFactory.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Metadata\Property\Factory; -use ApiPlatform\Core\Cache\CachedTrait; use ApiPlatform\Metadata\Property\PropertyNameCollection; +use ApiPlatform\Util\CachedTrait; use Psr\Cache\CacheItemPoolInterface; /** diff --git a/src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php b/src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php index 0708698671b..a564aa33e40 100644 --- a/src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php +++ b/src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php @@ -16,9 +16,9 @@ use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface; use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface as SerializerClassMetadataFactoryInterface; diff --git a/src/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyMetadataFactory.php b/src/Metadata/Property/PropertyInfoPropertyMetadataFactory.php similarity index 98% rename from src/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyMetadataFactory.php rename to src/Metadata/Property/PropertyInfoPropertyMetadataFactory.php index 7e489a3e6d5..8123c800d16 100644 --- a/src/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyMetadataFactory.php +++ b/src/Metadata/Property/PropertyInfoPropertyMetadataFactory.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property; +namespace ApiPlatform\Metadata\Property; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; diff --git a/src/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyNameCollectionFactory.php b/src/Metadata/Property/PropertyInfoPropertyNameCollectionFactory.php similarity index 94% rename from src/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyNameCollectionFactory.php rename to src/Metadata/Property/PropertyInfoPropertyNameCollectionFactory.php index 50f9970acb2..54819c8b718 100644 --- a/src/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyNameCollectionFactory.php +++ b/src/Metadata/Property/PropertyInfoPropertyNameCollectionFactory.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property; +namespace ApiPlatform\Metadata\Property; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; diff --git a/src/Metadata/Resource/Factory/FiltersResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/FiltersResourceMetadataCollectionFactory.php index a43720a1664..d123ec58fd5 100644 --- a/src/Metadata/Resource/Factory/FiltersResourceMetadataCollectionFactory.php +++ b/src/Metadata/Resource/Factory/FiltersResourceMetadataCollectionFactory.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Metadata\Resource\Factory; -use ApiPlatform\Core\Util\AnnotationFilterExtractorTrait; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Util\AnnotationFilterExtractorTrait; use Doctrine\Common\Annotations\Reader; /** diff --git a/src/OpenApi/Factory/OpenApiFactory.php b/src/OpenApi/Factory/OpenApiFactory.php index d77fe24f43c..20204be22b3 100644 --- a/src/OpenApi/Factory/OpenApiFactory.php +++ b/src/OpenApi/Factory/OpenApiFactory.php @@ -14,25 +14,24 @@ namespace ApiPlatform\OpenApi\Factory; use ApiPlatform\Core\Api\FilterLocatorTrait; -use ApiPlatform\Core\DataProvider\PaginationOptions; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface as LegacyPropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; -use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface; -use ApiPlatform\Core\OpenApi\Model; -use ApiPlatform\Core\OpenApi\Model\ExternalDocumentation; -use ApiPlatform\Core\OpenApi\OpenApi; -use ApiPlatform\Core\OpenApi\Options; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\TypeFactoryInterface; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Operation; use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\OpenApi\Model; +use ApiPlatform\OpenApi\Model\ExternalDocumentation; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\OpenApi\Options; +use ApiPlatform\PathResolver\OperationPathResolverInterface; +use ApiPlatform\State\Pagination\PaginationOptions; use Psr\Container\ContainerInterface; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Routing\RouterInterface; diff --git a/src/Core/OpenApi/Factory/OpenApiFactoryInterface.php b/src/OpenApi/Factory/OpenApiFactoryInterface.php similarity index 83% rename from src/Core/OpenApi/Factory/OpenApiFactoryInterface.php rename to src/OpenApi/Factory/OpenApiFactoryInterface.php index d4b04bb190f..cbd14fdb4d2 100644 --- a/src/Core/OpenApi/Factory/OpenApiFactoryInterface.php +++ b/src/OpenApi/Factory/OpenApiFactoryInterface.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Factory; +namespace ApiPlatform\OpenApi\Factory; -use ApiPlatform\Core\OpenApi\OpenApi; +use ApiPlatform\OpenApi\OpenApi; interface OpenApiFactoryInterface { diff --git a/src/Core/OpenApi/Model/Components.php b/src/OpenApi/Model/Components.php similarity index 98% rename from src/Core/OpenApi/Model/Components.php rename to src/OpenApi/Model/Components.php index a9e7205b96b..681996bccb0 100644 --- a/src/Core/OpenApi/Model/Components.php +++ b/src/OpenApi/Model/Components.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Components { diff --git a/src/Core/OpenApi/Model/Contact.php b/src/OpenApi/Model/Contact.php similarity index 96% rename from src/Core/OpenApi/Model/Contact.php rename to src/OpenApi/Model/Contact.php index 61cc320ef99..81437ef0081 100644 --- a/src/Core/OpenApi/Model/Contact.php +++ b/src/OpenApi/Model/Contact.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Contact { diff --git a/src/Core/OpenApi/Model/Encoding.php b/src/OpenApi/Model/Encoding.php similarity index 98% rename from src/Core/OpenApi/Model/Encoding.php rename to src/OpenApi/Model/Encoding.php index 38366265fa5..8b83f4c71ba 100644 --- a/src/Core/OpenApi/Model/Encoding.php +++ b/src/OpenApi/Model/Encoding.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Encoding { diff --git a/src/Core/OpenApi/Model/ExtensionTrait.php b/src/OpenApi/Model/ExtensionTrait.php similarity index 94% rename from src/Core/OpenApi/Model/ExtensionTrait.php rename to src/OpenApi/Model/ExtensionTrait.php index e68e286d040..0033241e373 100644 --- a/src/Core/OpenApi/Model/ExtensionTrait.php +++ b/src/OpenApi/Model/ExtensionTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; trait ExtensionTrait { diff --git a/src/Core/OpenApi/Model/ExternalDocumentation.php b/src/OpenApi/Model/ExternalDocumentation.php similarity index 96% rename from src/Core/OpenApi/Model/ExternalDocumentation.php rename to src/OpenApi/Model/ExternalDocumentation.php index f606a26b4d7..5c0c5b97d12 100644 --- a/src/Core/OpenApi/Model/ExternalDocumentation.php +++ b/src/OpenApi/Model/ExternalDocumentation.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class ExternalDocumentation { diff --git a/src/Core/OpenApi/Model/Info.php b/src/OpenApi/Model/Info.php similarity index 98% rename from src/Core/OpenApi/Model/Info.php rename to src/OpenApi/Model/Info.php index 8901db38995..aab2a0e4d65 100644 --- a/src/Core/OpenApi/Model/Info.php +++ b/src/OpenApi/Model/Info.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Info { diff --git a/src/Core/OpenApi/Model/License.php b/src/OpenApi/Model/License.php similarity index 96% rename from src/Core/OpenApi/Model/License.php rename to src/OpenApi/Model/License.php index 2370752352a..b103fc7fa11 100644 --- a/src/Core/OpenApi/Model/License.php +++ b/src/OpenApi/Model/License.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class License { diff --git a/src/Core/OpenApi/Model/Link.php b/src/OpenApi/Model/Link.php similarity index 98% rename from src/Core/OpenApi/Model/Link.php rename to src/OpenApi/Model/Link.php index a0feb9511d6..edd7180d221 100644 --- a/src/Core/OpenApi/Model/Link.php +++ b/src/OpenApi/Model/Link.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Link { diff --git a/src/Core/OpenApi/Model/MediaType.php b/src/OpenApi/Model/MediaType.php similarity index 97% rename from src/Core/OpenApi/Model/MediaType.php rename to src/OpenApi/Model/MediaType.php index 8f232bb4b4b..ae97fec3583 100644 --- a/src/Core/OpenApi/Model/MediaType.php +++ b/src/OpenApi/Model/MediaType.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class MediaType { diff --git a/src/Core/OpenApi/Model/OAuthFlow.php b/src/OpenApi/Model/OAuthFlow.php similarity index 97% rename from src/Core/OpenApi/Model/OAuthFlow.php rename to src/OpenApi/Model/OAuthFlow.php index 1b3dfd4849b..e8e6b35c1f6 100644 --- a/src/Core/OpenApi/Model/OAuthFlow.php +++ b/src/OpenApi/Model/OAuthFlow.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class OAuthFlow { diff --git a/src/Core/OpenApi/Model/OAuthFlows.php b/src/OpenApi/Model/OAuthFlows.php similarity index 97% rename from src/Core/OpenApi/Model/OAuthFlows.php rename to src/OpenApi/Model/OAuthFlows.php index afe06ad4824..0e0cc02db5c 100644 --- a/src/Core/OpenApi/Model/OAuthFlows.php +++ b/src/OpenApi/Model/OAuthFlows.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class OAuthFlows { diff --git a/src/Core/OpenApi/Model/Operation.php b/src/OpenApi/Model/Operation.php similarity index 99% rename from src/Core/OpenApi/Model/Operation.php rename to src/OpenApi/Model/Operation.php index b21c792abcc..d829f1d7a01 100644 --- a/src/Core/OpenApi/Model/Operation.php +++ b/src/OpenApi/Model/Operation.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Operation { diff --git a/src/Core/OpenApi/Model/Parameter.php b/src/OpenApi/Model/Parameter.php similarity index 99% rename from src/Core/OpenApi/Model/Parameter.php rename to src/OpenApi/Model/Parameter.php index 6c93efbedec..9965704db78 100644 --- a/src/Core/OpenApi/Model/Parameter.php +++ b/src/OpenApi/Model/Parameter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Parameter { diff --git a/src/Core/OpenApi/Model/PathItem.php b/src/OpenApi/Model/PathItem.php similarity index 99% rename from src/Core/OpenApi/Model/PathItem.php rename to src/OpenApi/Model/PathItem.php index ddc4b057e0c..5f08abde98a 100644 --- a/src/Core/OpenApi/Model/PathItem.php +++ b/src/OpenApi/Model/PathItem.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class PathItem { diff --git a/src/Core/OpenApi/Model/Paths.php b/src/OpenApi/Model/Paths.php similarity index 93% rename from src/Core/OpenApi/Model/Paths.php rename to src/OpenApi/Model/Paths.php index efaa04a8e8a..babfdb82cb0 100644 --- a/src/Core/OpenApi/Model/Paths.php +++ b/src/OpenApi/Model/Paths.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Paths { diff --git a/src/Core/OpenApi/Model/RequestBody.php b/src/OpenApi/Model/RequestBody.php similarity index 97% rename from src/Core/OpenApi/Model/RequestBody.php rename to src/OpenApi/Model/RequestBody.php index 04235777a5e..350136faf70 100644 --- a/src/Core/OpenApi/Model/RequestBody.php +++ b/src/OpenApi/Model/RequestBody.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class RequestBody { diff --git a/src/Core/OpenApi/Model/Response.php b/src/OpenApi/Model/Response.php similarity index 97% rename from src/Core/OpenApi/Model/Response.php rename to src/OpenApi/Model/Response.php index 9bb2f84d353..54c7326a2fc 100644 --- a/src/Core/OpenApi/Model/Response.php +++ b/src/OpenApi/Model/Response.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Response { diff --git a/src/Core/OpenApi/Model/Schema.php b/src/OpenApi/Model/Schema.php similarity index 97% rename from src/Core/OpenApi/Model/Schema.php rename to src/OpenApi/Model/Schema.php index 66c629bfc01..68a31abf779 100644 --- a/src/Core/OpenApi/Model/Schema.php +++ b/src/OpenApi/Model/Schema.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; -use ApiPlatform\Core\JsonSchema\Schema as JsonSchema; +use ApiPlatform\JsonSchema\Schema as JsonSchema; final class Schema extends \ArrayObject { diff --git a/src/Core/OpenApi/Model/SecurityScheme.php b/src/OpenApi/Model/SecurityScheme.php similarity index 98% rename from src/Core/OpenApi/Model/SecurityScheme.php rename to src/OpenApi/Model/SecurityScheme.php index ddbc477dcd4..600770f257f 100644 --- a/src/Core/OpenApi/Model/SecurityScheme.php +++ b/src/OpenApi/Model/SecurityScheme.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class SecurityScheme { diff --git a/src/Core/OpenApi/Model/Server.php b/src/OpenApi/Model/Server.php similarity index 97% rename from src/Core/OpenApi/Model/Server.php rename to src/OpenApi/Model/Server.php index 852afd5c9ad..35eaafe6b28 100644 --- a/src/Core/OpenApi/Model/Server.php +++ b/src/OpenApi/Model/Server.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Model; +namespace ApiPlatform\OpenApi\Model; final class Server { diff --git a/src/Core/OpenApi/OpenApi.php b/src/OpenApi/OpenApi.php similarity index 92% rename from src/Core/OpenApi/OpenApi.php rename to src/OpenApi/OpenApi.php index 055530d0fa5..5a417388b5c 100644 --- a/src/Core/OpenApi/OpenApi.php +++ b/src/OpenApi/OpenApi.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi; +namespace ApiPlatform\OpenApi; -use ApiPlatform\Core\Documentation\DocumentationInterface; -use ApiPlatform\Core\OpenApi\Model\Components; -use ApiPlatform\Core\OpenApi\Model\ExtensionTrait; -use ApiPlatform\Core\OpenApi\Model\Info; -use ApiPlatform\Core\OpenApi\Model\Paths; +use ApiPlatform\Documentation\DocumentationInterface; +use ApiPlatform\OpenApi\Model\Components; +use ApiPlatform\OpenApi\Model\ExtensionTrait; +use ApiPlatform\OpenApi\Model\Info; +use ApiPlatform\OpenApi\Model\Paths; final class OpenApi implements DocumentationInterface { diff --git a/src/Core/OpenApi/Options.php b/src/OpenApi/Options.php similarity index 99% rename from src/Core/OpenApi/Options.php rename to src/OpenApi/Options.php index d4a995123af..65a66293e1d 100644 --- a/src/Core/OpenApi/Options.php +++ b/src/OpenApi/Options.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi; +namespace ApiPlatform\OpenApi; final class Options { diff --git a/src/Core/Swagger/Serializer/ApiGatewayNormalizer.php b/src/OpenApi/Serializer/ApiGatewayNormalizer.php similarity index 99% rename from src/Core/Swagger/Serializer/ApiGatewayNormalizer.php rename to src/OpenApi/Serializer/ApiGatewayNormalizer.php index c7ab8037474..c904208a51f 100644 --- a/src/Core/Swagger/Serializer/ApiGatewayNormalizer.php +++ b/src/OpenApi/Serializer/ApiGatewayNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Swagger\Serializer; +namespace ApiPlatform\OpenApi\Serializer; use Symfony\Component\Serializer\Exception\UnexpectedValueException; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; diff --git a/src/Core/OpenApi/Serializer/OpenApiNormalizer.php b/src/OpenApi/Serializer/OpenApiNormalizer.php similarity index 95% rename from src/Core/OpenApi/Serializer/OpenApiNormalizer.php rename to src/OpenApi/Serializer/OpenApiNormalizer.php index db37bffbb2a..86991992af2 100644 --- a/src/Core/OpenApi/Serializer/OpenApiNormalizer.php +++ b/src/OpenApi/Serializer/OpenApiNormalizer.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\OpenApi\Serializer; +namespace ApiPlatform\OpenApi\Serializer; -use ApiPlatform\Core\OpenApi\Model\Paths; -use ApiPlatform\Core\OpenApi\OpenApi; +use ApiPlatform\OpenApi\Model\Paths; +use ApiPlatform\OpenApi\OpenApi; use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/Core/PathResolver/CustomOperationPathResolver.php b/src/PathResolver/CustomOperationPathResolver.php similarity index 97% rename from src/Core/PathResolver/CustomOperationPathResolver.php rename to src/PathResolver/CustomOperationPathResolver.php index 9bba449cd00..a11909255b8 100644 --- a/src/Core/PathResolver/CustomOperationPathResolver.php +++ b/src/PathResolver/CustomOperationPathResolver.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\PathResolver; +namespace ApiPlatform\PathResolver; use ApiPlatform\Core\Api\OperationTypeDeprecationHelper; diff --git a/src/Core/PathResolver/OperationPathResolver.php b/src/PathResolver/OperationPathResolver.php similarity index 98% rename from src/Core/PathResolver/OperationPathResolver.php rename to src/PathResolver/OperationPathResolver.php index f461ed59a4c..19f2199fd6e 100644 --- a/src/Core/PathResolver/OperationPathResolver.php +++ b/src/PathResolver/OperationPathResolver.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\PathResolver; +namespace ApiPlatform\PathResolver; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\OperationTypeDeprecationHelper; diff --git a/src/Core/PathResolver/OperationPathResolverInterface.php b/src/PathResolver/OperationPathResolverInterface.php similarity index 96% rename from src/Core/PathResolver/OperationPathResolverInterface.php rename to src/PathResolver/OperationPathResolverInterface.php index 8c901926e7a..e9c305c1aad 100644 --- a/src/Core/PathResolver/OperationPathResolverInterface.php +++ b/src/PathResolver/OperationPathResolverInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\PathResolver; +namespace ApiPlatform\PathResolver; /** * Resolves the path of a resource operation. diff --git a/src/Core/Problem/Serializer/ConstraintViolationListNormalizer.php b/src/Problem/Serializer/ConstraintViolationListNormalizer.php similarity index 93% rename from src/Core/Problem/Serializer/ConstraintViolationListNormalizer.php rename to src/Problem/Serializer/ConstraintViolationListNormalizer.php index b13232e4880..70325c06227 100644 --- a/src/Core/Problem/Serializer/ConstraintViolationListNormalizer.php +++ b/src/Problem/Serializer/ConstraintViolationListNormalizer.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Problem\Serializer; +namespace ApiPlatform\Problem\Serializer; -use ApiPlatform\Core\Serializer\AbstractConstraintViolationListNormalizer; +use ApiPlatform\Serializer\AbstractConstraintViolationListNormalizer; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; /** diff --git a/src/Core/Problem/Serializer/ErrorNormalizer.php b/src/Problem/Serializer/ErrorNormalizer.php similarity index 97% rename from src/Core/Problem/Serializer/ErrorNormalizer.php rename to src/Problem/Serializer/ErrorNormalizer.php index 9faf2942f96..2d424d58ea2 100644 --- a/src/Core/Problem/Serializer/ErrorNormalizer.php +++ b/src/Problem/Serializer/ErrorNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Problem\Serializer; +namespace ApiPlatform\Problem\Serializer; use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException; use Symfony\Component\ErrorHandler\Exception\FlattenException; diff --git a/src/Core/Problem/Serializer/ErrorNormalizerTrait.php b/src/Problem/Serializer/ErrorNormalizerTrait.php similarity index 97% rename from src/Core/Problem/Serializer/ErrorNormalizerTrait.php rename to src/Problem/Serializer/ErrorNormalizerTrait.php index 8c10d718d34..773fade6bcf 100644 --- a/src/Core/Problem/Serializer/ErrorNormalizerTrait.php +++ b/src/Problem/Serializer/ErrorNormalizerTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Problem\Serializer; +namespace ApiPlatform\Problem\Serializer; use ApiPlatform\Exception\ErrorCodeSerializableInterface; use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException; diff --git a/src/Core/Bridge/RamseyUuid/Serializer/UuidDenormalizer.php b/src/RamseyUuid/Serializer/UuidDenormalizer.php similarity index 95% rename from src/Core/Bridge/RamseyUuid/Serializer/UuidDenormalizer.php rename to src/RamseyUuid/Serializer/UuidDenormalizer.php index 9e5d9df749f..9df2f011c66 100644 --- a/src/Core/Bridge/RamseyUuid/Serializer/UuidDenormalizer.php +++ b/src/RamseyUuid/Serializer/UuidDenormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\RamseyUuid\Serializer; +namespace ApiPlatform\RamseyUuid\Serializer; use Ramsey\Uuid\Exception\InvalidUuidStringException; use Ramsey\Uuid\Uuid; diff --git a/src/Core/Serializer/AbstractCollectionNormalizer.php b/src/Serializer/AbstractCollectionNormalizer.php similarity index 96% rename from src/Core/Serializer/AbstractCollectionNormalizer.php rename to src/Serializer/AbstractCollectionNormalizer.php index f82234fd652..d59d7931c70 100644 --- a/src/Core/Serializer/AbstractCollectionNormalizer.php +++ b/src/Serializer/AbstractCollectionNormalizer.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait; diff --git a/src/Core/Serializer/AbstractConstraintViolationListNormalizer.php b/src/Serializer/AbstractConstraintViolationListNormalizer.php similarity index 98% rename from src/Core/Serializer/AbstractConstraintViolationListNormalizer.php rename to src/Serializer/AbstractConstraintViolationListNormalizer.php index fba79004543..fcc9f4f1430 100644 --- a/src/Core/Serializer/AbstractConstraintViolationListNormalizer.php +++ b/src/Serializer/AbstractConstraintViolationListNormalizer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; diff --git a/src/Core/Serializer/AbstractItemNormalizer.php b/src/Serializer/AbstractItemNormalizer.php similarity index 99% rename from src/Core/Serializer/AbstractItemNormalizer.php rename to src/Serializer/AbstractItemNormalizer.php index af2a6d54f03..931af03c651 100644 --- a/src/Core/Serializer/AbstractItemNormalizer.php +++ b/src/Serializer/AbstractItemNormalizer.php @@ -11,20 +11,18 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface as LegacyPropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; +use ApiPlatform\DataTransformer\DataTransformerInitializerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\InvalidValueException; use ApiPlatform\Exception\ItemNotFoundException; @@ -32,6 +30,8 @@ use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; diff --git a/src/Core/Serializer/CacheKeyTrait.php b/src/Serializer/CacheKeyTrait.php similarity index 95% rename from src/Core/Serializer/CacheKeyTrait.php rename to src/Serializer/CacheKeyTrait.php index 8d69fb7d598..51cb44952d9 100644 --- a/src/Core/Serializer/CacheKeyTrait.php +++ b/src/Serializer/CacheKeyTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; trait CacheKeyTrait { diff --git a/src/Core/Serializer/ContextTrait.php b/src/Serializer/ContextTrait.php similarity index 94% rename from src/Core/Serializer/ContextTrait.php rename to src/Serializer/ContextTrait.php index 005f045cbed..daf67498f62 100644 --- a/src/Core/Serializer/ContextTrait.php +++ b/src/Serializer/ContextTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; /** * Creates and manipulates the Serializer context. diff --git a/src/Core/Serializer/Filter/FilterInterface.php b/src/Serializer/Filter/FilterInterface.php similarity index 94% rename from src/Core/Serializer/Filter/FilterInterface.php rename to src/Serializer/Filter/FilterInterface.php index fba3352eabe..e9ad7e6bf01 100644 --- a/src/Core/Serializer/Filter/FilterInterface.php +++ b/src/Serializer/Filter/FilterInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer\Filter; +namespace ApiPlatform\Serializer\Filter; use ApiPlatform\Core\Api\FilterInterface as BaseFilterInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Serializer/Filter/GroupFilter.php b/src/Serializer/Filter/GroupFilter.php similarity index 97% rename from src/Core/Serializer/Filter/GroupFilter.php rename to src/Serializer/Filter/GroupFilter.php index 257e82efe53..24999cab313 100644 --- a/src/Core/Serializer/Filter/GroupFilter.php +++ b/src/Serializer/Filter/GroupFilter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer\Filter; +namespace ApiPlatform\Serializer\Filter; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; diff --git a/src/Core/Serializer/Filter/PropertyFilter.php b/src/Serializer/Filter/PropertyFilter.php similarity index 99% rename from src/Core/Serializer/Filter/PropertyFilter.php rename to src/Serializer/Filter/PropertyFilter.php index a02231bd3eb..41e1e86ecff 100644 --- a/src/Core/Serializer/Filter/PropertyFilter.php +++ b/src/Serializer/Filter/PropertyFilter.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer\Filter; +namespace ApiPlatform\Serializer\Filter; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; diff --git a/src/Core/Serializer/InputOutputMetadataTrait.php b/src/Serializer/InputOutputMetadataTrait.php similarity index 98% rename from src/Core/Serializer/InputOutputMetadataTrait.php rename to src/Serializer/InputOutputMetadataTrait.php index 410abc8e920..8c7758053cf 100644 --- a/src/Core/Serializer/InputOutputMetadataTrait.php +++ b/src/Serializer/InputOutputMetadataTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Exception\OperationNotFoundException; diff --git a/src/Core/Serializer/ItemNormalizer.php b/src/Serializer/ItemNormalizer.php similarity index 97% rename from src/Core/Serializer/ItemNormalizer.php rename to src/Serializer/ItemNormalizer.php index 7c24572c78d..c081de9a2e9 100644 --- a/src/Core/Serializer/ItemNormalizer.php +++ b/src/Serializer/ItemNormalizer.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; diff --git a/src/Core/Serializer/JsonEncoder.php b/src/Serializer/JsonEncoder.php similarity index 98% rename from src/Core/Serializer/JsonEncoder.php rename to src/Serializer/JsonEncoder.php index def8dff9de5..a336ae787a9 100644 --- a/src/Core/Serializer/JsonEncoder.php +++ b/src/Serializer/JsonEncoder.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use Symfony\Component\Serializer\Encoder\DecoderInterface; use Symfony\Component\Serializer\Encoder\EncoderInterface; diff --git a/src/Core/Serializer/Mapping/Factory/ClassMetadataFactory.php b/src/Serializer/Mapping/Factory/ClassMetadataFactory.php similarity index 92% rename from src/Core/Serializer/Mapping/Factory/ClassMetadataFactory.php rename to src/Serializer/Mapping/Factory/ClassMetadataFactory.php index 29da7f3f859..954c8bdb8dc 100644 --- a/src/Core/Serializer/Mapping/Factory/ClassMetadataFactory.php +++ b/src/Serializer/Mapping/Factory/ClassMetadataFactory.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer\Mapping\Factory; +namespace ApiPlatform\Serializer\Mapping\Factory; -use ApiPlatform\Core\Util\ClassInfoTrait; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\Serializer\Mapping\ClassMetadataInterface; use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface; diff --git a/src/Core/Serializer/ResourceList.php b/src/Serializer/ResourceList.php similarity index 89% rename from src/Core/Serializer/ResourceList.php rename to src/Serializer/ResourceList.php index ca6ecc7a184..3817529da26 100644 --- a/src/Core/Serializer/ResourceList.php +++ b/src/Serializer/ResourceList.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; /** * @internal diff --git a/src/Core/Serializer/SerializerContextBuilder.php b/src/Serializer/SerializerContextBuilder.php similarity index 98% rename from src/Core/Serializer/SerializerContextBuilder.php rename to src/Serializer/SerializerContextBuilder.php index 4f39b08bccb..0af60e6b55c 100644 --- a/src/Core/Serializer/SerializerContextBuilder.php +++ b/src/Serializer/SerializerContextBuilder.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Serializer\Encoder\CsvEncoder; diff --git a/src/Core/Serializer/SerializerContextBuilderInterface.php b/src/Serializer/SerializerContextBuilderInterface.php similarity index 95% rename from src/Core/Serializer/SerializerContextBuilderInterface.php rename to src/Serializer/SerializerContextBuilderInterface.php index 618c5b0c181..96ac637defa 100644 --- a/src/Core/Serializer/SerializerContextBuilderInterface.php +++ b/src/Serializer/SerializerContextBuilderInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use ApiPlatform\Exception\RuntimeException; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Serializer/SerializerFilterContextBuilder.php b/src/Serializer/SerializerFilterContextBuilder.php similarity index 94% rename from src/Core/Serializer/SerializerFilterContextBuilder.php rename to src/Serializer/SerializerFilterContextBuilder.php index 2bb862c9f12..3132861b8af 100644 --- a/src/Core/Serializer/SerializerFilterContextBuilder.php +++ b/src/Serializer/SerializerFilterContextBuilder.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Serializer; +namespace ApiPlatform\Serializer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Serializer\Filter\FilterInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\Filter\FilterInterface; +use ApiPlatform\Util\RequestAttributesExtractor; use Psr\Container\ContainerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/DataProvider/ArrayPaginator.php b/src/State/Pagination/ArrayPaginator.php similarity index 97% rename from src/Core/DataProvider/ArrayPaginator.php rename to src/State/Pagination/ArrayPaginator.php index b238e39ca79..94adbcea280 100644 --- a/src/Core/DataProvider/ArrayPaginator.php +++ b/src/State/Pagination/ArrayPaginator.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataProvider; +namespace ApiPlatform\State\Pagination; /** * Paginator for arrays. diff --git a/src/Core/DataProvider/Pagination.php b/src/State/Pagination/Pagination.php similarity index 99% rename from src/Core/DataProvider/Pagination.php rename to src/State/Pagination/Pagination.php index 78ed9ead000..b1c3f6b5984 100644 --- a/src/Core/DataProvider/Pagination.php +++ b/src/State/Pagination/Pagination.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataProvider; +namespace ApiPlatform\State\Pagination; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; diff --git a/src/Core/DataProvider/PaginationOptions.php b/src/State/Pagination/PaginationOptions.php similarity index 98% rename from src/Core/DataProvider/PaginationOptions.php rename to src/State/Pagination/PaginationOptions.php index 5e8e56b54e1..2e62cc58926 100644 --- a/src/Core/DataProvider/PaginationOptions.php +++ b/src/State/Pagination/PaginationOptions.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataProvider; +namespace ApiPlatform\State\Pagination; final class PaginationOptions { diff --git a/src/Core/DataProvider/PaginatorInterface.php b/src/State/Pagination/PaginatorInterface.php similarity index 94% rename from src/Core/DataProvider/PaginatorInterface.php rename to src/State/Pagination/PaginatorInterface.php index 1dc5013fe40..a1d88e44f50 100644 --- a/src/Core/DataProvider/PaginatorInterface.php +++ b/src/State/Pagination/PaginatorInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataProvider; +namespace ApiPlatform\State\Pagination; /** * The \Countable implementation should return the number of items on the diff --git a/src/Core/DataProvider/PartialPaginatorInterface.php b/src/State/Pagination/PartialPaginatorInterface.php similarity index 93% rename from src/Core/DataProvider/PartialPaginatorInterface.php rename to src/State/Pagination/PartialPaginatorInterface.php index 0c679366f4e..c3c3037ac66 100644 --- a/src/Core/DataProvider/PartialPaginatorInterface.php +++ b/src/State/Pagination/PartialPaginatorInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataProvider; +namespace ApiPlatform\State\Pagination; /** * Partial Paginator Interface. diff --git a/src/Core/DataProvider/TraversablePaginator.php b/src/State/Pagination/TraversablePaginator.php similarity index 97% rename from src/Core/DataProvider/TraversablePaginator.php rename to src/State/Pagination/TraversablePaginator.php index 91635bc1fb4..9b40f517804 100644 --- a/src/Core/DataProvider/TraversablePaginator.php +++ b/src/State/Pagination/TraversablePaginator.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\DataProvider; +namespace ApiPlatform\State\Pagination; final class TraversablePaginator implements \IteratorAggregate, PaginatorInterface { diff --git a/src/Core/Bridge/Symfony/Bundle/ApiPlatformBundle.php b/src/Symfony/Bundle/ApiPlatformBundle.php similarity index 59% rename from src/Core/Bridge/Symfony/Bundle/ApiPlatformBundle.php rename to src/Symfony/Bundle/ApiPlatformBundle.php index 9d9c8803da5..6c7462f6c13 100644 --- a/src/Core/Bridge/Symfony/Bundle/ApiPlatformBundle.php +++ b/src/Symfony/Bundle/ApiPlatformBundle.php @@ -11,19 +11,19 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle; +namespace ApiPlatform\Symfony\Bundle; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\FilterPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\FilterPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass; use Symfony\Component\DependencyInjection\Compiler\PassConfig; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Core/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php b/src/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php similarity index 92% rename from src/Core/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php rename to src/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php index 23cad60bcf7..2681a94748a 100644 --- a/src/Core/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php +++ b/src/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\ArgumentResolver; +namespace ApiPlatform\Symfony\Bundle\ArgumentResolver; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface; use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; diff --git a/src/Core/Bridge/Symfony/Bundle/CacheWarmer/CachePoolClearerCacheWarmer.php b/src/Symfony/Bundle/CacheWarmer/CachePoolClearerCacheWarmer.php similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/CacheWarmer/CachePoolClearerCacheWarmer.php rename to src/Symfony/Bundle/CacheWarmer/CachePoolClearerCacheWarmer.php index a40241b9c76..d9ead7ef527 100644 --- a/src/Core/Bridge/Symfony/Bundle/CacheWarmer/CachePoolClearerCacheWarmer.php +++ b/src/Symfony/Bundle/CacheWarmer/CachePoolClearerCacheWarmer.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\CacheWarmer; +namespace ApiPlatform\Symfony\Bundle\CacheWarmer; use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer; use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php b/src/Symfony/Bundle/Command/GraphQlExportCommand.php similarity index 97% rename from src/Core/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php rename to src/Symfony/Bundle/Command/GraphQlExportCommand.php index 99f57f2f75e..a0ce0797c78 100644 --- a/src/Core/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php +++ b/src/Symfony/Bundle/Command/GraphQlExportCommand.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Command; +namespace ApiPlatform\Symfony\Bundle\Command; use ApiPlatform\Core\GraphQl\Type\SchemaBuilderInterface as SchemaBuilderLegacyInterface; use ApiPlatform\GraphQl\Type\SchemaBuilderInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/Command/OpenApiCommand.php b/src/Symfony/Bundle/Command/OpenApiCommand.php similarity index 96% rename from src/Core/Bridge/Symfony/Bundle/Command/OpenApiCommand.php rename to src/Symfony/Bundle/Command/OpenApiCommand.php index 68314d55098..380afc8aaf0 100644 --- a/src/Core/Bridge/Symfony/Bundle/Command/OpenApiCommand.php +++ b/src/Symfony/Bundle/Command/OpenApiCommand.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Command; +namespace ApiPlatform\Symfony\Bundle\Command; -use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface; +use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/DataCollector/RequestDataCollector.php b/src/Symfony/Bundle/DataCollector/RequestDataCollector.php similarity index 97% rename from src/Core/Bridge/Symfony/Bundle/DataCollector/RequestDataCollector.php rename to src/Symfony/Bundle/DataCollector/RequestDataCollector.php index a4e84783493..7701a85adab 100644 --- a/src/Core/Bridge/Symfony/Bundle/DataCollector/RequestDataCollector.php +++ b/src/Symfony/Bundle/DataCollector/RequestDataCollector.php @@ -11,23 +11,23 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DataCollector; +namespace ApiPlatform\Symfony\Bundle\DataCollector; use ApiPlatform\Core\Bridge\Symfony\Bundle\DataPersister\TraceableChainDataPersister; use ApiPlatform\Core\Bridge\Symfony\Bundle\DataProvider\TraceableChainCollectionDataProvider; use ApiPlatform\Core\Bridge\Symfony\Bundle\DataProvider\TraceableChainItemDataProvider; use ApiPlatform\Core\Bridge\Symfony\Bundle\DataProvider\TraceableChainSubresourceDataProvider; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Processor\TraceableChainProcessor; use ApiPlatform\Core\DataPersister\DataPersisterInterface; use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; use ApiPlatform\Core\Metadata\Resource\ApiResourceToLegacyResourceMetadataTrait; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\State\ProcessorInterface; +use ApiPlatform\Symfony\Bundle\Processor\TraceableChainProcessor; +use ApiPlatform\Util\RequestAttributesExtractor; use PackageVersions\Versions; use Psr\Container\ContainerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php b/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php rename to src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php index 743d9d96fcd..68f59a877a5 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php +++ b/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php @@ -11,36 +11,36 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection; use ApiPlatform\Core\Annotation\ApiResource; use ApiPlatform\Core\Api\FilterInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\AbstractFilter as DoctrineMongoDbOdmAbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\EagerLoadingExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface as DoctrineQueryCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter as DoctrineOrmAbstractContextAwareFilter; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface; -use ApiPlatform\Core\Bridge\Symfony\Validator\ValidationGroupsGeneratorInterface; use ApiPlatform\Core\DataPersister\DataPersisterInterface; use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; use ApiPlatform\Core\Metadata\Extractor\XmlExtractor; use ApiPlatform\Core\Metadata\Extractor\YamlExtractor; +use ApiPlatform\DataTransformer\DataTransformerInitializerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Filter\AbstractFilter as DoctrineMongoDbOdmAbstractFilter; +use ApiPlatform\Doctrine\Orm\Extension\EagerLoadingExtension; +use ApiPlatform\Doctrine\Orm\Extension\FilterEagerLoadingExtension; +use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface as DoctrineQueryCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Filter\AbstractContextAwareFilter as DoctrineOrmAbstractContextAwareFilter; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; use ApiPlatform\GraphQl\Error\ErrorHandlerInterface; use ApiPlatform\GraphQl\Resolver\MutationResolverInterface; use ApiPlatform\GraphQl\Resolver\QueryCollectionResolverInterface; use ApiPlatform\GraphQl\Resolver\QueryItemResolverInterface; use ApiPlatform\GraphQl\Type\Definition\TypeInterface as GraphQlTypeInterface; use ApiPlatform\State\ProviderInterface; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface; +use ApiPlatform\Symfony\Validator\ValidationGroupsGeneratorInterface; use Doctrine\Common\Annotations\Annotation; use phpDocumentor\Reflection\DocBlockFactoryInterface; use Ramsey\Uuid\Uuid; @@ -96,6 +96,20 @@ public function load(array $configs, ContainerBuilder $container): void { $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $deprecatedInterfaces = include __DIR__.'/../../../deprecated_interfaces.php'; + foreach ($deprecatedInterfaces as $oldInterface => $newInterface) { + if ($container->hasAlias($oldInterface)) { + throw new \LogicException(sprintf('Alias already exist for interface %s. Update xml first to use the new interface.', $oldInterface)); + } + + if ($container->hasAlias($newInterface)) { + $container->setAlias($oldInterface, $newInterface); + $container + ->getDefinition($oldInterface) + ->setDeprecated('api-platform/core', '2.7', sprintf('The interface %s is deprecated, use %s instead.', $oldInterface, $newInterface)); + } + } + $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php index f8bfa9d9ed9..8f072fb4f21 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use ApiPlatform\Core\Annotation\ApiFilter; -use ApiPlatform\Core\Util\AnnotationFilterExtractorTrait; -use ApiPlatform\Core\Util\ReflectionClassRecursiveIterator; +use ApiPlatform\Util\AnnotationFilterExtractorTrait; +use ApiPlatform\Util\ReflectionClassRecursiveIterator; use Doctrine\Common\Annotations\Reader; use Symfony\Component\DependencyInjection\ChildDefinition; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPass.php similarity index 91% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPass.php index 6df6b0cde60..772d370c794 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php index b00efa803ea..1364a760e45 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\DataProvider\SerializerAwareDataProviderInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPass.php similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPass.php index a7eb16c5ee5..afa28c12a42 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use Symfony\Component\Config\Definition\BaseNode; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php index 4949074f5c0..0d99dd7468c 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use Elasticsearch\ClientBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php index 1f1a01ab1d9..2897b0c4e30 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use ApiPlatform\Exception\RuntimeException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPass.php similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPass.php index 44e530f52fb..cb032239ece 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPass.php similarity index 93% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPass.php index 0d09afbc972..882a3510317 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePass.php similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePass.php index 559a1814a54..3c412b33123 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php index 240d9439cad..aee2cbf109d 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; use ApiPlatform\Exception\RuntimeException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/TestClientPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/TestClientPass.php similarity index 89% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/TestClientPass.php rename to src/Symfony/Bundle/DependencyInjection/Compiler/TestClientPass.php index 1d1ec96c61b..c2812085e03 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/TestClientPass.php +++ b/src/Symfony/Bundle/DependencyInjection/Compiler/TestClientPass.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Client; +use ApiPlatform\Symfony\Bundle\Test\Client; use Symfony\Component\BrowserKit\AbstractBrowser; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/DependencyInjection/Configuration.php similarity index 99% rename from src/Core/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php rename to src/Symfony/Bundle/DependencyInjection/Configuration.php index 74f008c973b..123dec600e7 100644 --- a/src/Core/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/DependencyInjection/Configuration.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection; +namespace ApiPlatform\Symfony\Bundle\DependencyInjection; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Doctrine\Common\Filter\OrderFilterInterface; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; use ApiPlatform\Exception\FilterValidationException; use ApiPlatform\Exception\InvalidArgumentException; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; diff --git a/src/Core/Bridge/Symfony/Bundle/EventListener/SwaggerUiListener.php b/src/Symfony/Bundle/EventListener/SwaggerUiListener.php similarity index 93% rename from src/Core/Bridge/Symfony/Bundle/EventListener/SwaggerUiListener.php rename to src/Symfony/Bundle/EventListener/SwaggerUiListener.php index 7b56fd1bdd2..65d58468fb9 100644 --- a/src/Core/Bridge/Symfony/Bundle/EventListener/SwaggerUiListener.php +++ b/src/Symfony/Bundle/EventListener/SwaggerUiListener.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\EventListener; +namespace ApiPlatform\Symfony\Bundle\EventListener; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/Core/Bridge/Symfony/Bundle/Processor/TraceableChainProcessor.php b/src/Symfony/Bundle/Processor/TraceableChainProcessor.php similarity index 97% rename from src/Core/Bridge/Symfony/Bundle/Processor/TraceableChainProcessor.php rename to src/Symfony/Bundle/Processor/TraceableChainProcessor.php index 1e7c6cb4235..3156ea2ad13 100644 --- a/src/Core/Bridge/Symfony/Bundle/Processor/TraceableChainProcessor.php +++ b/src/Symfony/Bundle/Processor/TraceableChainProcessor.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Processor; +namespace ApiPlatform\Symfony\Bundle\Processor; use ApiPlatform\State\ChainProcessor; use ApiPlatform\State\ProcessorInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/api.xml b/src/Symfony/Bundle/Resources/config/api.xml similarity index 92% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/api.xml rename to src/Symfony/Bundle/Resources/config/api.xml index 9ffe31df408..49b08c5e127 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/api.xml +++ b/src/Symfony/Bundle/Resources/config/api.xml @@ -29,7 +29,7 @@ - + @@ -50,7 +50,7 @@ - + %api_platform.url_generation_strategy% @@ -93,29 +93,29 @@ - + - + - + - + properties false null - + - - + + - + @@ -135,7 +135,7 @@ - + @@ -149,11 +149,11 @@ - + - + @@ -168,7 +168,7 @@ - + %api_platform.formats% @@ -217,7 +217,7 @@ - + @@ -236,13 +236,13 @@ - + - + %api_platform.error_formats% %api_platform.exception_to_status% @@ -250,7 +250,7 @@ - + api_platform.action.exception false @@ -262,7 +262,7 @@ - + @@ -270,14 +270,14 @@ - - + + - + - + %api_platform.title% %api_platform.description% @@ -287,7 +287,7 @@ - + %api_platform.error_formats% %api_platform.exception_to_status% @@ -381,7 +381,7 @@ - + api_platform.cache.metadata.property diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/argument_resolver.xml b/src/Symfony/Bundle/Resources/config/argument_resolver.xml similarity index 86% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/argument_resolver.xml rename to src/Symfony/Bundle/Resources/config/argument_resolver.xml index 944bd1e7738..68f063d74f7 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/argument_resolver.xml +++ b/src/Symfony/Bundle/Resources/config/argument_resolver.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/data_collector.xml b/src/Symfony/Bundle/Resources/config/data_collector.xml similarity index 93% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/data_collector.xml rename to src/Symfony/Bundle/Resources/config/data_collector.xml index ccd78e5a25c..08956bab01c 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/data_collector.xml +++ b/src/Symfony/Bundle/Resources/config/data_collector.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/data_persister.xml b/src/Symfony/Bundle/Resources/config/data_persister.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/data_persister.xml rename to src/Symfony/Bundle/Resources/config/data_persister.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/data_provider.xml b/src/Symfony/Bundle/Resources/config/data_provider.xml similarity index 91% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/data_provider.xml rename to src/Symfony/Bundle/Resources/config/data_provider.xml index 583447ffe34..49b835ab400 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/data_provider.xml +++ b/src/Symfony/Bundle/Resources/config/data_provider.xml @@ -27,14 +27,14 @@ - + %api_platform.collection.pagination% %api_platform.graphql.collection.pagination% - + - + %api_platform.collection.pagination.enabled% %api_platform.collection.pagination.page_parameter_name% %api_platform.collection.pagination.client_items_per_page% @@ -47,7 +47,7 @@ %api_platform.collection.pagination.client_partial% %api_platform.collection.pagination.partial_parameter_name% - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/debug.xml b/src/Symfony/Bundle/Resources/config/debug.xml similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/debug.xml rename to src/Symfony/Bundle/Resources/config/debug.xml index cdead4ddc2e..8805cddae8f 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/debug.xml +++ b/src/Symfony/Bundle/Resources/config/debug.xml @@ -32,7 +32,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml similarity index 76% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml rename to src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml index 4b4d3e87d6b..c6533774cb5 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml +++ b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml @@ -6,7 +6,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -93,56 +93,56 @@ - + - + - + - + - + - + %api_platform.collection.exists_parameter_name% - + - + - + - + %api_platform.collection.order_parameter_name% - + - + - + @@ -150,35 +150,35 @@ - + - + + class="ApiPlatform\Doctrine\Odm\Extension\PaginationExtension" public="false"> - + - + %api_platform.collection.order% - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm_mercure_publisher.xml b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm_mercure_publisher.xml similarity index 93% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm_mercure_publisher.xml rename to src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm_mercure_publisher.xml index 24e4fb1ba55..1fe783c87e5 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm_mercure_publisher.xml +++ b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm_mercure_publisher.xml @@ -8,7 +8,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml similarity index 75% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml rename to src/Symfony/Bundle/Resources/config/doctrine_orm.xml index 612a10187b4..e5b0bc1a86f 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml +++ b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -73,7 +73,7 @@ - + null @@ -82,9 +82,9 @@ - + - + null %api_platform.collection.order_parameter_name% @@ -92,59 +92,59 @@ %api_platform.collection.order_nulls_comparison% - + - + null - + - + null - + - + null - + - + null - + - + null %api_platform.collection.exists_parameter_name% - + - + - + @@ -159,45 +159,45 @@ - + - + - + - + %api_platform.eager_loading.force_eager% - + - + - + - + %api_platform.collection.order% - + - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml similarity index 93% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml rename to src/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml index a3f73c3ea38..4937a5230d3 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml +++ b/src/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml @@ -8,7 +8,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml similarity index 93% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml rename to src/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml index 0366e0e3b79..d988c67c94e 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml +++ b/src/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml @@ -8,7 +8,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/elasticsearch.xml b/src/Symfony/Bundle/Resources/config/elasticsearch.xml similarity index 79% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/elasticsearch.xml rename to src/Symfony/Bundle/Resources/config/elasticsearch.xml index 47f76aa28a0..bbc1e5e0a76 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/elasticsearch.xml +++ b/src/Symfony/Bundle/Resources/config/elasticsearch.xml @@ -17,24 +17,24 @@ - + - + %api_platform.elasticsearch.mapping% - + - + - + @@ -44,15 +44,15 @@ - + - + - + @@ -105,15 +105,15 @@ - + - + - + @@ -134,20 +134,20 @@ - - + + - - + + - + %api_platform.collection.order_parameter_name% - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/filter.xml b/src/Symfony/Bundle/Resources/config/filter.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/filter.xml rename to src/Symfony/Bundle/Resources/config/filter.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/fos_user.xml b/src/Symfony/Bundle/Resources/config/fos_user.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/fos_user.xml rename to src/Symfony/Bundle/Resources/config/fos_user.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/graphql.xml b/src/Symfony/Bundle/Resources/config/graphql.xml similarity index 99% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/graphql.xml rename to src/Symfony/Bundle/Resources/config/graphql.xml index 456aa53de51..d34525aefad 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/graphql.xml +++ b/src/Symfony/Bundle/Resources/config/graphql.xml @@ -329,7 +329,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/graphql_mercure.xml b/src/Symfony/Bundle/Resources/config/graphql_mercure.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/graphql_mercure.xml rename to src/Symfony/Bundle/Resources/config/graphql_mercure.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/hal.xml b/src/Symfony/Bundle/Resources/config/hal.xml similarity index 88% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/hal.xml rename to src/Symfony/Bundle/Resources/config/hal.xml index c7a5fbec648..9a9f0086729 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/hal.xml +++ b/src/Symfony/Bundle/Resources/config/hal.xml @@ -5,13 +5,13 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + jsonhal - + @@ -19,7 +19,7 @@ - + %api_platform.collection.pagination.page_parameter_name% @@ -28,7 +28,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/http_cache.xml b/src/Symfony/Bundle/Resources/config/http_cache.xml similarity index 91% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/http_cache.xml rename to src/Symfony/Bundle/Resources/config/http_cache.xml index c54ecaf4633..9c7ddd21bf1 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/http_cache.xml +++ b/src/Symfony/Bundle/Resources/config/http_cache.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + %api_platform.http_cache.etag% %api_platform.http_cache.max_age% %api_platform.http_cache.shared_max_age% diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/http_cache_tags.xml b/src/Symfony/Bundle/Resources/config/http_cache_tags.xml similarity index 85% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/http_cache_tags.xml rename to src/Symfony/Bundle/Resources/config/http_cache_tags.xml index 5b25cf5df2d..18ad04458d5 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/http_cache_tags.xml +++ b/src/Symfony/Bundle/Resources/config/http_cache_tags.xml @@ -6,10 +6,10 @@ - - + + - + %api_platform.http_cache.invalidation.xkey.enabled% diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/hydra.xml b/src/Symfony/Bundle/Resources/config/hydra.xml similarity index 82% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/hydra.xml rename to src/Symfony/Bundle/Resources/config/hydra.xml index 6f7e5c9f539..ee636cb8f21 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/hydra.xml +++ b/src/Symfony/Bundle/Resources/config/hydra.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + @@ -21,7 +21,7 @@ - + @@ -29,7 +29,7 @@ - + %api_platform.validator.serialize_payload_fields% @@ -37,7 +37,7 @@ - + @@ -45,14 +45,14 @@ - + %kernel.debug% - + @@ -61,7 +61,7 @@ - + %api_platform.collection.pagination.page_parameter_name% %api_platform.collection.pagination.enabled_parameter_name% @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/json_schema.xml b/src/Symfony/Bundle/Resources/config/json_schema.xml similarity index 79% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/json_schema.xml rename to src/Symfony/Bundle/Resources/config/json_schema.xml index d22801ab5ce..dc009118346 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/json_schema.xml +++ b/src/Symfony/Bundle/Resources/config/json_schema.xml @@ -7,15 +7,15 @@ - + - + - + @@ -23,9 +23,9 @@ - + - + %api_platform.formats% diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/jsonapi.xml b/src/Symfony/Bundle/Resources/config/jsonapi.xml similarity index 81% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/jsonapi.xml rename to src/Symfony/Bundle/Resources/config/jsonapi.xml index 0e76f46de91..85576222f90 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/jsonapi.xml +++ b/src/Symfony/Bundle/Resources/config/jsonapi.xml @@ -5,17 +5,17 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + jsonapi - + - + @@ -23,7 +23,7 @@ - + %api_platform.collection.pagination.page_parameter_name% @@ -32,7 +32,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -58,14 +58,14 @@ - + - + %kernel.debug% @@ -73,22 +73,22 @@ - + - + %api_platform.collection.order_parameter_name% - + - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/jsonld.xml b/src/Symfony/Bundle/Resources/config/jsonld.xml similarity index 91% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/jsonld.xml rename to src/Symfony/Bundle/Resources/config/jsonld.xml index cf2aa871212..7b8486b0ccf 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/jsonld.xml +++ b/src/Symfony/Bundle/Resources/config/jsonld.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + @@ -15,7 +15,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -42,7 +42,7 @@ - + jsonld @@ -50,7 +50,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/maker.xml b/src/Symfony/Bundle/Resources/config/maker.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/maker.xml rename to src/Symfony/Bundle/Resources/config/maker.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/mercure.xml b/src/Symfony/Bundle/Resources/config/mercure.xml similarity index 89% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/mercure.xml rename to src/Symfony/Bundle/Resources/config/mercure.xml index f604706a805..4f1f652cec9 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/mercure.xml +++ b/src/Symfony/Bundle/Resources/config/mercure.xml @@ -7,7 +7,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/messenger.xml b/src/Symfony/Bundle/Resources/config/messenger.xml similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/messenger.xml rename to src/Symfony/Bundle/Resources/config/messenger.xml index 7de5b402f66..6becaacb08c 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/Resources/config/messenger.xml @@ -21,7 +21,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/annotation.xml b/src/Symfony/Bundle/Resources/config/metadata/annotation.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/annotation.xml rename to src/Symfony/Bundle/Resources/config/metadata/annotation.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/metadata.xml b/src/Symfony/Bundle/Resources/config/metadata/metadata.xml similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/metadata.xml rename to src/Symfony/Bundle/Resources/config/metadata/metadata.xml index b6cef644c1c..ddb1dab38e2 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/metadata.xml +++ b/src/Symfony/Bundle/Resources/config/metadata/metadata.xml @@ -47,7 +47,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/php_doc.xml b/src/Symfony/Bundle/Resources/config/metadata/php_doc.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/php_doc.xml rename to src/Symfony/Bundle/Resources/config/metadata/php_doc.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/resource_collection.xml b/src/Symfony/Bundle/Resources/config/metadata/resource_collection.xml similarity index 98% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/resource_collection.xml rename to src/Symfony/Bundle/Resources/config/metadata/resource_collection.xml index 40bcd0d3f13..54bad5bfdca 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/resource_collection.xml +++ b/src/Symfony/Bundle/Resources/config/metadata/resource_collection.xml @@ -76,7 +76,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/xml.xml b/src/Symfony/Bundle/Resources/config/metadata/xml.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/xml.xml rename to src/Symfony/Bundle/Resources/config/metadata/xml.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/yaml.xml b/src/Symfony/Bundle/Resources/config/metadata/yaml.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/yaml.xml rename to src/Symfony/Bundle/Resources/config/metadata/yaml.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/nelmio_api_doc.xml b/src/Symfony/Bundle/Resources/config/nelmio_api_doc.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/nelmio_api_doc.xml rename to src/Symfony/Bundle/Resources/config/nelmio_api_doc.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/openapi.xml b/src/Symfony/Bundle/Resources/config/openapi.xml similarity index 89% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/openapi.xml rename to src/Symfony/Bundle/Resources/config/openapi.xml index 36033b1289d..66499a4a2c7 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/openapi.xml +++ b/src/Symfony/Bundle/Resources/config/openapi.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + @@ -27,9 +27,9 @@ - + - + %api_platform.title% %api_platform.description% %api_platform.version% @@ -48,7 +48,7 @@ %api_platform.openapi.license.name% %api_platform.openapi.license.url% - + @@ -81,15 +81,15 @@ - + - + - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/problem.xml b/src/Symfony/Bundle/Resources/config/problem.xml similarity index 81% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/problem.xml rename to src/Symfony/Bundle/Resources/config/problem.xml index da6c5fd730a..5c23f8ecfa0 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/problem.xml +++ b/src/Symfony/Bundle/Resources/config/problem.xml @@ -6,20 +6,20 @@ - + jsonproblem - + %api_platform.validator.serialize_payload_fields% - + %kernel.debug% diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/ramsey_uuid.xml b/src/Symfony/Bundle/Resources/config/ramsey_uuid.xml similarity index 91% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/ramsey_uuid.xml rename to src/Symfony/Bundle/Resources/config/ramsey_uuid.xml index 329b6c169a3..3d34bb37ced 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/ramsey_uuid.xml +++ b/src/Symfony/Bundle/Resources/config/ramsey_uuid.xml @@ -9,7 +9,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/rector.xml b/src/Symfony/Bundle/Resources/config/rector.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/rector.xml rename to src/Symfony/Bundle/Resources/config/rector.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/routing/api.xml b/src/Symfony/Bundle/Resources/config/routing/api.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/routing/api.xml rename to src/Symfony/Bundle/Resources/config/routing/api.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/routing/docs.xml b/src/Symfony/Bundle/Resources/config/routing/docs.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/routing/docs.xml rename to src/Symfony/Bundle/Resources/config/routing/docs.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/routing/graphql/graphiql.xml b/src/Symfony/Bundle/Resources/config/routing/graphql/graphiql.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/routing/graphql/graphiql.xml rename to src/Symfony/Bundle/Resources/config/routing/graphql/graphiql.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/routing/graphql/graphql.xml b/src/Symfony/Bundle/Resources/config/routing/graphql/graphql.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/routing/graphql/graphql.xml rename to src/Symfony/Bundle/Resources/config/routing/graphql/graphql.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/routing/graphql/graphql_playground.xml b/src/Symfony/Bundle/Resources/config/routing/graphql/graphql_playground.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/routing/graphql/graphql_playground.xml rename to src/Symfony/Bundle/Resources/config/routing/graphql/graphql_playground.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/routing/jsonld.xml b/src/Symfony/Bundle/Resources/config/routing/jsonld.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/routing/jsonld.xml rename to src/Symfony/Bundle/Resources/config/routing/jsonld.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/security.xml b/src/Symfony/Bundle/Resources/config/security.xml similarity index 84% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/security.xml rename to src/Symfony/Bundle/Resources/config/security.xml index 9feccd6a29a..6898635f5a0 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/security.xml +++ b/src/Symfony/Bundle/Resources/config/security.xml @@ -7,16 +7,16 @@ - + - + - + @@ -28,7 +28,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/state.xml b/src/Symfony/Bundle/Resources/config/state.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/state.xml rename to src/Symfony/Bundle/Resources/config/state.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/swagger-ui.xml b/src/Symfony/Bundle/Resources/config/swagger-ui.xml similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/swagger-ui.xml rename to src/Symfony/Bundle/Resources/config/swagger-ui.xml index e5e394a02af..492e8f909ea 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/swagger-ui.xml +++ b/src/Symfony/Bundle/Resources/config/swagger-ui.xml @@ -6,7 +6,7 @@ - + @@ -41,7 +41,7 @@ %api_platform.swagger_ui.extra_configuration% - + %api_platform.enable_swagger_ui% %api_platform.show_webby% %api_platform.enable_re_doc% @@ -52,7 +52,7 @@ %api_platform.swagger_ui.extra_configuration% - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/swagger.xml b/src/Symfony/Bundle/Resources/config/swagger.xml similarity index 95% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/swagger.xml rename to src/Symfony/Bundle/Resources/config/swagger.xml index 9e768f6a41f..51e3785ccfb 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/swagger.xml +++ b/src/Symfony/Bundle/Resources/config/swagger.xml @@ -37,7 +37,7 @@ - + diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/symfony_uid.xml b/src/Symfony/Bundle/Resources/config/symfony_uid.xml similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/symfony_uid.xml rename to src/Symfony/Bundle/Resources/config/symfony_uid.xml diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/config/validator.xml b/src/Symfony/Bundle/Resources/config/validator.xml similarity index 63% rename from src/Core/Bridge/Symfony/Bundle/Resources/config/validator.xml rename to src/Symfony/Bundle/Resources/config/validator.xml index 2ea59e8eea8..31698ee8a1c 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/config/validator.xml +++ b/src/Symfony/Bundle/Resources/config/validator.xml @@ -5,73 +5,73 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -82,7 +82,7 @@ - + %api_platform.validator.query_parameter_validation% diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/es6-promise/es6-promise.auto.min.js b/src/Symfony/Bundle/Resources/public/es6-promise/es6-promise.auto.min.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/es6-promise/es6-promise.auto.min.js rename to src/Symfony/Bundle/Resources/public/es6-promise/es6-promise.auto.min.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fetch/fetch.js b/src/Symfony/Bundle/Resources/public/fetch/fetch.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fetch/fetch.js rename to src/Symfony/Bundle/Resources/public/fetch/fetch.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/400.css b/src/Symfony/Bundle/Resources/public/fonts/open-sans/400.css similarity index 72% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/400.css rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/400.css index 3fea6f2efbe..9fc1e71d660 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/400.css +++ b/src/Symfony/Bundle/Resources/public/fonts/open-sans/400.css @@ -4,7 +4,7 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('./files/open-sans-cyrillic-ext-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); + src: url('files/open-sans-cyrillic-ext-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* open-sans-cyrillic-400-normal*/ @@ -13,7 +13,7 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('./files/open-sans-cyrillic-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); + src: url('files/open-sans-cyrillic-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* open-sans-greek-ext-400-normal*/ @@ -22,7 +22,7 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('./files/open-sans-greek-ext-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); + src: url('files/open-sans-greek-ext-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); unicode-range: U+1F00-1FFF; } /* open-sans-greek-400-normal*/ @@ -31,7 +31,7 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('./files/open-sans-greek-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); + src: url('files/open-sans-greek-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); unicode-range: U+0370-03FF; } /* open-sans-hebrew-400-normal*/ @@ -49,7 +49,7 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('./files/open-sans-vietnamese-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); + src: url('files/open-sans-vietnamese-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; } /* open-sans-latin-ext-400-normal*/ @@ -58,7 +58,7 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('./files/open-sans-latin-ext-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); + src: url('files/open-sans-latin-ext-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* open-sans-latin-400-normal*/ @@ -67,6 +67,6 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('./files/open-sans-latin-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); + src: url('files/open-sans-latin-400-normal.woff2') format('woff2'), url('./files/open-sans-all-400-normal.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/700.css b/src/Symfony/Bundle/Resources/public/fonts/open-sans/700.css similarity index 72% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/700.css rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/700.css index fd0ada8e643..2967e8a5cc5 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/700.css +++ b/src/Symfony/Bundle/Resources/public/fonts/open-sans/700.css @@ -4,7 +4,7 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('./files/open-sans-cyrillic-ext-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); + src: url('files/open-sans-cyrillic-ext-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* open-sans-cyrillic-700-normal*/ @@ -13,7 +13,7 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('./files/open-sans-cyrillic-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); + src: url('files/open-sans-cyrillic-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* open-sans-greek-ext-700-normal*/ @@ -22,7 +22,7 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('./files/open-sans-greek-ext-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); + src: url('files/open-sans-greek-ext-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); unicode-range: U+1F00-1FFF; } /* open-sans-greek-700-normal*/ @@ -31,7 +31,7 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('./files/open-sans-greek-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); + src: url('files/open-sans-greek-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); unicode-range: U+0370-03FF; } /* open-sans-hebrew-700-normal*/ @@ -49,7 +49,7 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('./files/open-sans-vietnamese-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); + src: url('files/open-sans-vietnamese-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; } /* open-sans-latin-ext-700-normal*/ @@ -58,7 +58,7 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('./files/open-sans-latin-ext-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); + src: url('files/open-sans-latin-ext-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* open-sans-latin-700-normal*/ @@ -67,6 +67,6 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('./files/open-sans-latin-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); + src: url('files/open-sans-latin-700-normal.woff2') format('woff2'), url('./files/open-sans-all-700-normal.woff') format('woff'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-400-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-400-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-400-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-400-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-700-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-700-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-700-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-700-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-400-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-400-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-400-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-400-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-700-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-700-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-700-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-cyrillic-ext-700-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-400-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-400-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-400-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-400-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-700-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-700-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-700-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-700-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-400-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-400-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-400-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-400-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-700-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-700-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-700-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-greek-ext-700-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-400-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-400-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-400-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-400-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-700-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-700-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-700-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-700-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-400-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-400-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-400-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-400-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-700-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-700-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-700-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-latin-ext-700-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-400-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-400-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-400-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-400-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-700-normal.woff2 b/src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-700-normal.woff2 similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-700-normal.woff2 rename to src/Symfony/Bundle/Resources/public/fonts/open-sans/files/open-sans-vietnamese-700-normal.woff2 diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql-style.css b/src/Symfony/Bundle/Resources/public/graphiql-style.css similarity index 98% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql-style.css rename to src/Symfony/Bundle/Resources/public/graphiql-style.css index 1a4cbeeba09..ad5431eaf35 100644 --- a/src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql-style.css +++ b/src/Symfony/Bundle/Resources/public/graphiql-style.css @@ -33,7 +33,7 @@ body { content: ""; width: 185px; height: 50px; - background: url("./logo-header.svg") no-repeat; + background: url("logo-header.svg") no-repeat; vertical-align: middle; border-right: 1px solid white; } diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql/graphiql.css b/src/Symfony/Bundle/Resources/public/graphiql/graphiql.css similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql/graphiql.css rename to src/Symfony/Bundle/Resources/public/graphiql/graphiql.css diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql/graphiql.min.js b/src/Symfony/Bundle/Resources/public/graphiql/graphiql.min.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql/graphiql.min.js rename to src/Symfony/Bundle/Resources/public/graphiql/graphiql.min.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/graphql-playground/index.css b/src/Symfony/Bundle/Resources/public/graphql-playground/index.css similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/graphql-playground/index.css rename to src/Symfony/Bundle/Resources/public/graphql-playground/index.css diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/graphql-playground/middleware.js b/src/Symfony/Bundle/Resources/public/graphql-playground/middleware.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/graphql-playground/middleware.js rename to src/Symfony/Bundle/Resources/public/graphql-playground/middleware.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/init-graphiql.js b/src/Symfony/Bundle/Resources/public/init-graphiql.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/init-graphiql.js rename to src/Symfony/Bundle/Resources/public/init-graphiql.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/init-graphql-playground.js b/src/Symfony/Bundle/Resources/public/init-graphql-playground.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/init-graphql-playground.js rename to src/Symfony/Bundle/Resources/public/init-graphql-playground.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/init-redoc-ui.js b/src/Symfony/Bundle/Resources/public/init-redoc-ui.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/init-redoc-ui.js rename to src/Symfony/Bundle/Resources/public/init-redoc-ui.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/init-swagger-ui.js b/src/Symfony/Bundle/Resources/public/init-swagger-ui.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/init-swagger-ui.js rename to src/Symfony/Bundle/Resources/public/init-swagger-ui.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/logo-header.svg b/src/Symfony/Bundle/Resources/public/logo-header.svg similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/logo-header.svg rename to src/Symfony/Bundle/Resources/public/logo-header.svg diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/react/react-dom.production.min.js b/src/Symfony/Bundle/Resources/public/react/react-dom.production.min.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/react/react-dom.production.min.js rename to src/Symfony/Bundle/Resources/public/react/react-dom.production.min.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/react/react.production.min.js b/src/Symfony/Bundle/Resources/public/react/react.production.min.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/react/react.production.min.js rename to src/Symfony/Bundle/Resources/public/react/react.production.min.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/redoc/redoc.standalone.js b/src/Symfony/Bundle/Resources/public/redoc/redoc.standalone.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/redoc/redoc.standalone.js rename to src/Symfony/Bundle/Resources/public/redoc/redoc.standalone.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/style.css b/src/Symfony/Bundle/Resources/public/style.css similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/style.css rename to src/Symfony/Bundle/Resources/public/style.css diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/oauth2-redirect.html b/src/Symfony/Bundle/Resources/public/swagger-ui/oauth2-redirect.html similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/oauth2-redirect.html rename to src/Symfony/Bundle/Resources/public/swagger-ui/oauth2-redirect.html diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js b/src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js rename to src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js.map b/src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js.map similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js.map rename to src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-bundle.js.map diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js b/src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js rename to src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js.map b/src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js.map similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js.map rename to src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui-standalone-preset.js.map diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css b/src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css rename to src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css.map b/src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css.map similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css.map rename to src/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.css.map diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/web.png b/src/Symfony/Bundle/Resources/public/web.png similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/web.png rename to src/Symfony/Bundle/Resources/public/web.png diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/public/webby.png b/src/Symfony/Bundle/Resources/public/webby.png similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/public/webby.png rename to src/Symfony/Bundle/Resources/public/webby.png diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/views/DataCollector/api-platform-icon.svg b/src/Symfony/Bundle/Resources/views/DataCollector/api-platform-icon.svg similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/views/DataCollector/api-platform-icon.svg rename to src/Symfony/Bundle/Resources/views/DataCollector/api-platform-icon.svg diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/views/DataCollector/api-platform.svg b/src/Symfony/Bundle/Resources/views/DataCollector/api-platform.svg similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/views/DataCollector/api-platform.svg rename to src/Symfony/Bundle/Resources/views/DataCollector/api-platform.svg diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/views/DataCollector/request.html.twig b/src/Symfony/Bundle/Resources/views/DataCollector/request.html.twig similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/views/DataCollector/request.html.twig rename to src/Symfony/Bundle/Resources/views/DataCollector/request.html.twig diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/views/GraphQlPlayground/index.html.twig b/src/Symfony/Bundle/Resources/views/GraphQlPlayground/index.html.twig similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/views/GraphQlPlayground/index.html.twig rename to src/Symfony/Bundle/Resources/views/GraphQlPlayground/index.html.twig diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/views/Graphiql/index.html.twig b/src/Symfony/Bundle/Resources/views/Graphiql/index.html.twig similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/views/Graphiql/index.html.twig rename to src/Symfony/Bundle/Resources/views/Graphiql/index.html.twig diff --git a/src/Core/Bridge/Symfony/Bundle/Resources/views/SwaggerUi/index.html.twig b/src/Symfony/Bundle/Resources/views/SwaggerUi/index.html.twig similarity index 100% rename from src/Core/Bridge/Symfony/Bundle/Resources/views/SwaggerUi/index.html.twig rename to src/Symfony/Bundle/Resources/views/SwaggerUi/index.html.twig diff --git a/src/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiAction.php b/src/Symfony/Bundle/SwaggerUi/SwaggerUiAction.php similarity index 97% rename from src/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiAction.php rename to src/Symfony/Bundle/SwaggerUi/SwaggerUiAction.php index 9b1d67aa267..bdef1cb05cc 100644 --- a/src/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiAction.php +++ b/src/Symfony/Bundle/SwaggerUi/SwaggerUiAction.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi; +namespace ApiPlatform\Symfony\Bundle\SwaggerUi; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface; -use ApiPlatform\Core\OpenApi\Options; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface; +use ApiPlatform\OpenApi\Options; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiContext.php b/src/Symfony/Bundle/SwaggerUi/SwaggerUiContext.php similarity index 97% rename from src/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiContext.php rename to src/Symfony/Bundle/SwaggerUi/SwaggerUiContext.php index d37f51fcfbe..f8e4cd347af 100644 --- a/src/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiContext.php +++ b/src/Symfony/Bundle/SwaggerUi/SwaggerUiContext.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi; +namespace ApiPlatform\Symfony\Bundle\SwaggerUi; final class SwaggerUiContext { diff --git a/src/Core/Bridge/Symfony/Bundle/Test/ApiTestAssertionsTrait.php b/src/Symfony/Bundle/Test/ApiTestAssertionsTrait.php similarity index 94% rename from src/Core/Bridge/Symfony/Bundle/Test/ApiTestAssertionsTrait.php rename to src/Symfony/Bundle/Test/ApiTestAssertionsTrait.php index bd246318424..7fdc618305c 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/ApiTestAssertionsTrait.php +++ b/src/Symfony/Bundle/Test/ApiTestAssertionsTrait.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Symfony\Bundle\Test; use ApiPlatform\Core\Api\OperationType; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubset; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\MatchesJsonSchema; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubset; +use ApiPlatform\Symfony\Bundle\Test\Constraint\MatchesJsonSchema; use PHPUnit\Framework\ExpectationFailedException; use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/ApiTestCase.php b/src/Symfony/Bundle/Test/ApiTestCase.php similarity index 98% rename from src/Core/Bridge/Symfony/Bundle/Test/ApiTestCase.php rename to src/Symfony/Bundle/Test/ApiTestCase.php index caef5608d2c..7b5f8cf895c 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/ApiTestCase.php +++ b/src/Symfony/Bundle/Test/ApiTestCase.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Symfony\Bundle\Test; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\BrowserKit\AbstractBrowser; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php b/src/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php similarity index 99% rename from src/Core/Bridge/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php rename to src/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php index 0b25ec19d53..983727e542d 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php +++ b/src/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Symfony\Bundle\Test; use PHPUnit\Framework\Constraint\LogicalAnd; use PHPUnit\Framework\Constraint\LogicalNot; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/Client.php b/src/Symfony/Bundle/Test/Client.php similarity index 99% rename from src/Core/Bridge/Symfony/Bundle/Test/Client.php rename to src/Symfony/Bundle/Test/Client.php index 3eca318034a..c1cbca3dc3a 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/Client.php +++ b/src/Symfony/Bundle/Test/Client.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Symfony\Bundle\Test; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Component\BrowserKit\CookieJar; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubset.php b/src/Symfony/Bundle/Test/Constraint/ArraySubset.php similarity index 64% rename from src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubset.php rename to src/Symfony/Bundle/Test/Constraint/ArraySubset.php index 14861b9128f..59888c63b02 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubset.php +++ b/src/Symfony/Bundle/Test/Constraint/ArraySubset.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint; +namespace ApiPlatform\Symfony\Bundle\Test\Constraint; use PHPUnit\Runner\Version; use PHPUnit\SebastianBergmann\Comparator\ComparisonFailure; @@ -23,7 +23,7 @@ class_alias(LegacyComparisonFailure::class, 'PHPUnit\SebastianBergmann\Comparato // Aliases as string to avoid loading the class if (\PHP_VERSION_ID >= 80000 || (float) Version::series() >= 9) { - class_alias('ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubsetV9', 'ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubset'); + class_alias('ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubsetV9', 'ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubset'); } else { - class_alias('ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubsetLegacy', 'ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubset'); + class_alias('ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubsetLegacy', 'ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubset'); } diff --git a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php b/src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php similarity index 90% rename from src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php rename to src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php index 9ea25f9bf9f..139baae9a5f 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php +++ b/src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint; +namespace ApiPlatform\Symfony\Bundle\Test\Constraint; use PHPUnit\Framework\Constraint\Constraint; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php b/src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php similarity index 97% rename from src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php rename to src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php index c28af32e929..edba4581f19 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php +++ b/src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint; +namespace ApiPlatform\Symfony\Bundle\Test\Constraint; use PHPUnit\SebastianBergmann\Comparator\ComparisonFailure; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetV9.php b/src/Symfony/Bundle/Test/Constraint/ArraySubsetV9.php similarity index 90% rename from src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetV9.php rename to src/Symfony/Bundle/Test/Constraint/ArraySubsetV9.php index ccb16def0e6..195657f4dd9 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetV9.php +++ b/src/Symfony/Bundle/Test/Constraint/ArraySubsetV9.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint; +namespace ApiPlatform\Symfony\Bundle\Test\Constraint; use PHPUnit\Framework\Constraint\Constraint; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/MatchesJsonSchema.php b/src/Symfony/Bundle/Test/Constraint/MatchesJsonSchema.php similarity index 97% rename from src/Core/Bridge/Symfony/Bundle/Test/Constraint/MatchesJsonSchema.php rename to src/Symfony/Bundle/Test/Constraint/MatchesJsonSchema.php index 0ea9e8641be..e457639a331 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/Constraint/MatchesJsonSchema.php +++ b/src/Symfony/Bundle/Test/Constraint/MatchesJsonSchema.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint; +namespace ApiPlatform\Symfony\Bundle\Test\Constraint; use JsonSchema\Validator; use PHPUnit\Framework\Constraint\Constraint; diff --git a/src/Core/Bridge/Symfony/Bundle/Test/Response.php b/src/Symfony/Bundle/Test/Response.php similarity index 98% rename from src/Core/Bridge/Symfony/Bundle/Test/Response.php rename to src/Symfony/Bundle/Test/Response.php index 620ffe291a2..5a07589bb47 100644 --- a/src/Core/Bridge/Symfony/Bundle/Test/Response.php +++ b/src/Symfony/Bundle/Test/Response.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Symfony\Bundle\Test; use Symfony\Component\BrowserKit\Response as BrowserKitResponse; use Symfony\Component\HttpClient\Exception\ClientException; diff --git a/src/Core/EventListener/AddFormatListener.php b/src/Symfony/EventListener/AddFormatListener.php similarity index 98% rename from src/Core/EventListener/AddFormatListener.php rename to src/Symfony/EventListener/AddFormatListener.php index e3ecba6f3bc..24cf8458e0e 100644 --- a/src/Core/EventListener/AddFormatListener.php +++ b/src/Symfony/EventListener/AddFormatListener.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Core\Api\FormatMatcher; use ApiPlatform\Core\Api\FormatsProviderInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Negotiation\Negotiator; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/Core/Mercure/EventListener/AddLinkHeaderListener.php b/src/Symfony/EventListener/AddLinkHeaderListener.php similarity index 96% rename from src/Core/Mercure/EventListener/AddLinkHeaderListener.php rename to src/Symfony/EventListener/AddLinkHeaderListener.php index 5a33963534c..18b8ce1ed8c 100644 --- a/src/Core/Mercure/EventListener/AddLinkHeaderListener.php +++ b/src/Symfony/EventListener/AddLinkHeaderListener.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Mercure\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\CorsTrait; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\CorsTrait; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Fig\Link\GenericLinkProvider; use Fig\Link\Link; use Symfony\Component\HttpKernel\Event\ResponseEvent; diff --git a/src/Core/Security/EventListener/DenyAccessListener.php b/src/Symfony/EventListener/DenyAccessListener.php similarity index 96% rename from src/Core/Security/EventListener/DenyAccessListener.php rename to src/Symfony/EventListener/DenyAccessListener.php index 938c6007a71..b72f18a5565 100644 --- a/src/Core/Security/EventListener/DenyAccessListener.php +++ b/src/Symfony/EventListener/DenyAccessListener.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Security\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Security\ExpressionLanguage; -use ApiPlatform\Core\Security\ResourceAccessChecker; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\Security\ExpressionLanguage; +use ApiPlatform\Symfony\Security\ResourceAccessChecker; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Event\ViewEvent; diff --git a/src/Core/EventListener/DeserializeListener.php b/src/Symfony/EventListener/DeserializeListener.php similarity index 97% rename from src/Core/EventListener/DeserializeListener.php rename to src/Symfony/EventListener/DeserializeListener.php index a0983eabfb7..f48740a4b21 100644 --- a/src/Core/EventListener/DeserializeListener.php +++ b/src/Symfony/EventListener/DeserializeListener.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Core\Api\FormatMatcher; use ApiPlatform\Core\Api\FormatsProviderInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ToggleableOperationAttributeTrait; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; diff --git a/src/Core/EventListener/EventPriorities.php b/src/Symfony/EventListener/EventPriorities.php similarity index 95% rename from src/Core/EventListener/EventPriorities.php rename to src/Symfony/EventListener/EventPriorities.php index 4853d920efb..bfa958a26e7 100644 --- a/src/Core/EventListener/EventPriorities.php +++ b/src/Symfony/EventListener/EventPriorities.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\EventListener; +namespace ApiPlatform\Symfony\EventListener; /** * Constants for common priorities. diff --git a/src/Core/Validator/Exception/ValidationException.php b/src/Symfony/EventListener/Exception/ValidationException.php similarity index 89% rename from src/Core/Validator/Exception/ValidationException.php rename to src/Symfony/EventListener/Exception/ValidationException.php index 9adcac358ab..e9f5038613f 100644 --- a/src/Core/Validator/Exception/ValidationException.php +++ b/src/Symfony/EventListener/Exception/ValidationException.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Validator\Exception; +namespace ApiPlatform\Symfony\EventListener\Exception; use ApiPlatform\Exception\RuntimeException; diff --git a/src/Core/EventListener/ExceptionListener.php b/src/Symfony/EventListener/ExceptionListener.php similarity index 94% rename from src/Core/EventListener/ExceptionListener.php rename to src/Symfony/EventListener/ExceptionListener.php index e089ff370ba..58e1efb367f 100644 --- a/src/Core/EventListener/ExceptionListener.php +++ b/src/Symfony/EventListener/ExceptionListener.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\EventListener; +namespace ApiPlatform\Symfony\EventListener; -use ApiPlatform\Core\Util\RequestAttributesExtractor; +use ApiPlatform\Util\RequestAttributesExtractor; use Psr\Log\LoggerInterface; use Symfony\Component\HttpKernel\Event\ExceptionEvent; use Symfony\Component\HttpKernel\EventListener\ErrorListener; diff --git a/src/Core/JsonApi/EventListener/TransformFieldsetsParametersListener.php b/src/Symfony/EventListener/JsonApi/TransformFieldsetsParametersListener.php similarity index 98% rename from src/Core/JsonApi/EventListener/TransformFieldsetsParametersListener.php rename to src/Symfony/EventListener/JsonApi/TransformFieldsetsParametersListener.php index 23d5721b205..6ba21f7a75b 100644 --- a/src/Core/JsonApi/EventListener/TransformFieldsetsParametersListener.php +++ b/src/Symfony/EventListener/JsonApi/TransformFieldsetsParametersListener.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\EventListener; +namespace ApiPlatform\Symfony\EventListener\JsonApi; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; diff --git a/src/Core/JsonApi/EventListener/TransformFilteringParametersListener.php b/src/Symfony/EventListener/JsonApi/TransformFilteringParametersListener.php similarity index 95% rename from src/Core/JsonApi/EventListener/TransformFilteringParametersListener.php rename to src/Symfony/EventListener/JsonApi/TransformFilteringParametersListener.php index a5f28d342ed..18efa74852d 100644 --- a/src/Core/JsonApi/EventListener/TransformFilteringParametersListener.php +++ b/src/Symfony/EventListener/JsonApi/TransformFilteringParametersListener.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\EventListener; +namespace ApiPlatform\Symfony\EventListener\JsonApi; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/Core/JsonApi/EventListener/TransformPaginationParametersListener.php b/src/Symfony/EventListener/JsonApi/TransformPaginationParametersListener.php similarity index 95% rename from src/Core/JsonApi/EventListener/TransformPaginationParametersListener.php rename to src/Symfony/EventListener/JsonApi/TransformPaginationParametersListener.php index 53ecf934d9d..ec5cd2fd49f 100644 --- a/src/Core/JsonApi/EventListener/TransformPaginationParametersListener.php +++ b/src/Symfony/EventListener/JsonApi/TransformPaginationParametersListener.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\EventListener; +namespace ApiPlatform\Symfony\EventListener\JsonApi; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/Core/JsonApi/EventListener/TransformSortingParametersListener.php b/src/Symfony/EventListener/JsonApi/TransformSortingParametersListener.php similarity index 97% rename from src/Core/JsonApi/EventListener/TransformSortingParametersListener.php rename to src/Symfony/EventListener/JsonApi/TransformSortingParametersListener.php index 31fd7ade9a5..fc732b80107 100644 --- a/src/Core/JsonApi/EventListener/TransformSortingParametersListener.php +++ b/src/Symfony/EventListener/JsonApi/TransformSortingParametersListener.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\JsonApi\EventListener; +namespace ApiPlatform\Symfony\EventListener\JsonApi; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/Core/EventListener/QueryParameterValidateListener.php b/src/Symfony/EventListener/QueryParameterValidateListener.php similarity index 96% rename from src/Core/EventListener/QueryParameterValidateListener.php rename to src/Symfony/EventListener/QueryParameterValidateListener.php index e91889d55fb..9c074acde7a 100644 --- a/src/Core/EventListener/QueryParameterValidateListener.php +++ b/src/Symfony/EventListener/QueryParameterValidateListener.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Core\Filter\QueryParameterValidator; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ToggleableOperationAttributeTrait; -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use ApiPlatform\Core\Util\RequestParser; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; +use ApiPlatform\Util\RequestParser; use Symfony\Component\HttpKernel\Event\RequestEvent; /** diff --git a/src/Symfony/EventListener/ReadListener.php b/src/Symfony/EventListener/ReadListener.php index c61b9dc4db9..08e7f83919f 100644 --- a/src/Symfony/EventListener/ReadListener.php +++ b/src/Symfony/EventListener/ReadListener.php @@ -14,15 +14,15 @@ namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Api\UriVariablesConverterInterface; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; -use ApiPlatform\Core\Util\CloneTrait; -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use ApiPlatform\Core\Util\RequestParser; use ApiPlatform\Exception\InvalidIdentifierException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\State\ProviderInterface; use ApiPlatform\State\UriVariablesResolverTrait; +use ApiPlatform\Util\CloneTrait; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; +use ApiPlatform\Util\RequestParser; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Core/EventListener/RespondListener.php b/src/Symfony/EventListener/RespondListener.php similarity index 98% rename from src/Core/EventListener/RespondListener.php rename to src/Symfony/EventListener/RespondListener.php index 9ccd8386420..92e244851b2 100644 --- a/src/Core/EventListener/RespondListener.php +++ b/src/Symfony/EventListener/RespondListener.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ViewEvent; diff --git a/src/Core/EventListener/SerializeListener.php b/src/Symfony/EventListener/SerializeListener.php similarity index 96% rename from src/Core/EventListener/SerializeListener.php rename to src/Symfony/EventListener/SerializeListener.php index aae2167534b..72628115541 100644 --- a/src/Core/EventListener/SerializeListener.php +++ b/src/Symfony/EventListener/SerializeListener.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ToggleableOperationAttributeTrait; -use ApiPlatform\Core\Serializer\ResourceList; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Serializer\ResourceList; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Fig\Link\GenericLinkProvider; use Fig\Link\Link; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Validator/EventListener/ValidateListener.php b/src/Symfony/EventListener/ValidateListener.php similarity index 93% rename from src/Core/Validator/EventListener/ValidateListener.php rename to src/Symfony/EventListener/ValidateListener.php index 494edef2188..9cbc64fbe31 100644 --- a/src/Core/Validator/EventListener/ValidateListener.php +++ b/src/Symfony/EventListener/ValidateListener.php @@ -11,15 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Validator\EventListener; +namespace ApiPlatform\Symfony\EventListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ToggleableOperationAttributeTrait; -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use ApiPlatform\Core\Validator\Exception\ValidationException; -use ApiPlatform\Core\Validator\ValidatorInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Symfony\EventListener\Exception\ValidationException; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ViewEvent; diff --git a/src/Core/Validator/ValidatorInterface.php b/src/Symfony/EventListener/ValidatorInterface.php similarity index 82% rename from src/Core/Validator/ValidatorInterface.php rename to src/Symfony/EventListener/ValidatorInterface.php index bcd77aa6da1..ff2ba2b73d6 100644 --- a/src/Core/Validator/ValidatorInterface.php +++ b/src/Symfony/EventListener/ValidatorInterface.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Validator; +namespace ApiPlatform\Symfony\EventListener; -use ApiPlatform\Core\Validator\Exception\ValidationException; +use ApiPlatform\Symfony\EventListener\Exception\ValidationException; /** * Validates an item. diff --git a/src/Symfony/EventListener/WriteListener.php b/src/Symfony/EventListener/WriteListener.php index a152bf44a42..61c50169703 100644 --- a/src/Symfony/EventListener/WriteListener.php +++ b/src/Symfony/EventListener/WriteListener.php @@ -15,13 +15,13 @@ use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Exception\InvalidIdentifierException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\State\ProcessorInterface; use ApiPlatform\State\UriVariablesResolverTrait; use ApiPlatform\Util\OperationRequestInitiatorTrait; +use ApiPlatform\Util\RequestAttributesExtractor; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ViewEvent; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Core/Bridge/Symfony/Messenger/ContextStamp.php b/src/Symfony/Messenger/ContextStamp.php similarity index 93% rename from src/Core/Bridge/Symfony/Messenger/ContextStamp.php rename to src/Symfony/Messenger/ContextStamp.php index 40afe1b1384..11be14f7ab8 100644 --- a/src/Core/Bridge/Symfony/Messenger/ContextStamp.php +++ b/src/Symfony/Messenger/ContextStamp.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Messenger; +namespace ApiPlatform\Symfony\Messenger; use Symfony\Component\Messenger\Stamp\StampInterface; diff --git a/src/Core/Bridge/Symfony/Messenger/DataTransformer.php b/src/Symfony/Messenger/DataTransformer.php similarity index 95% rename from src/Core/Bridge/Symfony/Messenger/DataTransformer.php rename to src/Symfony/Messenger/DataTransformer.php index 5a63870d328..c1632b2d145 100644 --- a/src/Core/Bridge/Symfony/Messenger/DataTransformer.php +++ b/src/Symfony/Messenger/DataTransformer.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Messenger; +namespace ApiPlatform\Symfony\Messenger; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\Util\ClassInfoTrait; /** * Transforms an Input to itself. This gives the ability to send the Input to a diff --git a/src/Core/Bridge/Symfony/Messenger/DispatchTrait.php b/src/Symfony/Messenger/DispatchTrait.php similarity index 96% rename from src/Core/Bridge/Symfony/Messenger/DispatchTrait.php rename to src/Symfony/Messenger/DispatchTrait.php index 786c124ba6a..0502be7a40f 100644 --- a/src/Core/Bridge/Symfony/Messenger/DispatchTrait.php +++ b/src/Symfony/Messenger/DispatchTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Messenger; +namespace ApiPlatform\Symfony\Messenger; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\HandlerFailedException; diff --git a/src/Symfony/Messenger/Processor.php b/src/Symfony/Messenger/Processor.php index 903122e0c7f..3e3c1146362 100644 --- a/src/Symfony/Messenger/Processor.php +++ b/src/Symfony/Messenger/Processor.php @@ -13,15 +13,12 @@ namespace ApiPlatform\Symfony\Messenger; -use ApiPlatform\Core\Bridge\Symfony\Messenger\ContextStamp; -use ApiPlatform\Core\Bridge\Symfony\Messenger\DispatchTrait; -use ApiPlatform\Core\Bridge\Symfony\Messenger\RemoveStamp; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\Operation; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\State\ProcessorInterface; +use ApiPlatform\Util\ClassInfoTrait; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Stamp\HandledStamp; diff --git a/src/Core/Bridge/Symfony/Messenger/RemoveStamp.php b/src/Symfony/Messenger/RemoveStamp.php similarity index 90% rename from src/Core/Bridge/Symfony/Messenger/RemoveStamp.php rename to src/Symfony/Messenger/RemoveStamp.php index 8965b8d8d01..dc12d1b2166 100644 --- a/src/Core/Bridge/Symfony/Messenger/RemoveStamp.php +++ b/src/Symfony/Messenger/RemoveStamp.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Messenger; +namespace ApiPlatform\Symfony\Messenger; use Symfony\Component\Messenger\Stamp\StampInterface; diff --git a/src/Core/Bridge/Symfony/Routing/ApiLoader.php b/src/Symfony/Routing/ApiLoader.php similarity index 98% rename from src/Core/Bridge/Symfony/Routing/ApiLoader.php rename to src/Symfony/Routing/ApiLoader.php index 7285576e4e9..6492933cb4e 100644 --- a/src/Core/Bridge/Symfony/Routing/ApiLoader.php +++ b/src/Symfony/Routing/ApiLoader.php @@ -11,19 +11,20 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Routing; +namespace ApiPlatform\Symfony\Routing; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Api\OperationType; +use ApiPlatform\Core\Bridge\Symfony\Routing\RouteNameGenerator; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; use ApiPlatform\Exception\InvalidResourceException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\Operation; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\PathResolver\OperationPathResolverInterface; use Symfony\Component\Config\FileLocator; use Symfony\Component\Config\Loader\Loader; use Symfony\Component\Config\Resource\DirectoryResource; diff --git a/src/Symfony/Routing/IriConverter.php b/src/Symfony/Routing/IriConverter.php index 4e7bcd2c518..b100571a7fa 100644 --- a/src/Symfony/Routing/IriConverter.php +++ b/src/Symfony/Routing/IriConverter.php @@ -18,8 +18,6 @@ use ApiPlatform\Api\UriVariablesConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Util\AttributesExtractor; -use ApiPlatform\Core\Util\ResourceClassInfoTrait; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\InvalidIdentifierException; use ApiPlatform\Exception\ItemNotFoundException; @@ -28,6 +26,8 @@ use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\State\ProviderInterface; use ApiPlatform\State\UriVariablesResolverTrait; +use ApiPlatform\Util\AttributesExtractor; +use ApiPlatform\Util\ResourceClassInfoTrait; use Symfony\Component\Routing\Exception\ExceptionInterface as RoutingExceptionInterface; use Symfony\Component\Routing\RouterInterface; diff --git a/src/Core/Bridge/Symfony/Routing/Router.php b/src/Symfony/Routing/Router.php similarity index 98% rename from src/Core/Bridge/Symfony/Routing/Router.php rename to src/Symfony/Routing/Router.php index 60984327019..9380ca52a0b 100644 --- a/src/Core/Bridge/Symfony/Routing/Router.php +++ b/src/Symfony/Routing/Router.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Routing; +namespace ApiPlatform\Symfony\Routing; use ApiPlatform\Core\Api\UrlGeneratorInterface; use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface; diff --git a/src/Core/Security/Core/Authorization/ExpressionLanguageProvider.php b/src/Symfony/Security/Core/Authorization/ExpressionLanguageProvider.php similarity index 94% rename from src/Core/Security/Core/Authorization/ExpressionLanguageProvider.php rename to src/Symfony/Security/Core/Authorization/ExpressionLanguageProvider.php index 826d5141e3f..5ff56fb9d2a 100644 --- a/src/Core/Security/Core/Authorization/ExpressionLanguageProvider.php +++ b/src/Symfony/Security/Core/Authorization/ExpressionLanguageProvider.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Security\Core\Authorization; +namespace ApiPlatform\Symfony\Security\Core\Authorization; use Symfony\Component\ExpressionLanguage\ExpressionFunction; use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface; diff --git a/src/Core/Security/ExpressionLanguage.php b/src/Symfony/Security/ExpressionLanguage.php similarity index 97% rename from src/Core/Security/ExpressionLanguage.php rename to src/Symfony/Security/ExpressionLanguage.php index 62632f7ca17..172f8d9c6fe 100644 --- a/src/Core/Security/ExpressionLanguage.php +++ b/src/Symfony/Security/ExpressionLanguage.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Security; +namespace ApiPlatform\Symfony\Security; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Security\Core\Authorization\ExpressionLanguage as BaseExpressionLanguage; diff --git a/src/Core/Security/ResourceAccessChecker.php b/src/Symfony/Security/ResourceAccessChecker.php similarity index 99% rename from src/Core/Security/ResourceAccessChecker.php rename to src/Symfony/Security/ResourceAccessChecker.php index 23862b49a1a..709a9b05984 100644 --- a/src/Core/Security/ResourceAccessChecker.php +++ b/src/Symfony/Security/ResourceAccessChecker.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Security; +namespace ApiPlatform\Symfony\Security; use Symfony\Component\ExpressionLanguage\ExpressionLanguage; use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface; diff --git a/src/Core/Security/ResourceAccessCheckerInterface.php b/src/Symfony/Security/ResourceAccessCheckerInterface.php similarity index 94% rename from src/Core/Security/ResourceAccessCheckerInterface.php rename to src/Symfony/Security/ResourceAccessCheckerInterface.php index 7c3a6f49860..f699da6b8a6 100644 --- a/src/Core/Security/ResourceAccessCheckerInterface.php +++ b/src/Symfony/Security/ResourceAccessCheckerInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Security; +namespace ApiPlatform\Symfony\Security; /** * Checks if the logged user has sufficient permissions to access the given resource. diff --git a/src/Core/Bridge/Symfony/Validator/EventListener/ValidationExceptionListener.php b/src/Symfony/Validator/EventListener/ValidationExceptionListener.php similarity index 91% rename from src/Core/Bridge/Symfony/Validator/EventListener/ValidationExceptionListener.php rename to src/Symfony/Validator/EventListener/ValidationExceptionListener.php index 093ce1fb394..a34d0b4186e 100644 --- a/src/Core/Bridge/Symfony/Validator/EventListener/ValidationExceptionListener.php +++ b/src/Symfony/Validator/EventListener/ValidationExceptionListener.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\EventListener; +namespace ApiPlatform\Symfony\Validator\EventListener; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ConstraintViolationListAwareExceptionInterface; -use ApiPlatform\Core\Util\ErrorFormatGuesser; use ApiPlatform\Exception\FilterValidationException; +use ApiPlatform\Symfony\Validator\Exception\ConstraintViolationListAwareExceptionInterface; +use ApiPlatform\Util\ErrorFormatGuesser; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ExceptionEvent; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Core/Bridge/Symfony/Validator/Exception/ConstraintViolationListAwareExceptionInterface.php b/src/Symfony/Validator/Exception/ConstraintViolationListAwareExceptionInterface.php similarity index 91% rename from src/Core/Bridge/Symfony/Validator/Exception/ConstraintViolationListAwareExceptionInterface.php rename to src/Symfony/Validator/Exception/ConstraintViolationListAwareExceptionInterface.php index 34515846d35..1eafea9c9a1 100644 --- a/src/Core/Bridge/Symfony/Validator/Exception/ConstraintViolationListAwareExceptionInterface.php +++ b/src/Symfony/Validator/Exception/ConstraintViolationListAwareExceptionInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Exception; +namespace ApiPlatform\Symfony\Validator\Exception; use ApiPlatform\Exception\ExceptionInterface; use Symfony\Component\Validator\ConstraintViolationListInterface; diff --git a/src/Core/Bridge/Symfony/Validator/Exception/ValidationException.php b/src/Symfony/Validator/Exception/ValidationException.php similarity index 90% rename from src/Core/Bridge/Symfony/Validator/Exception/ValidationException.php rename to src/Symfony/Validator/Exception/ValidationException.php index b3a1ca6372f..9808c04d5b3 100644 --- a/src/Core/Bridge/Symfony/Validator/Exception/ValidationException.php +++ b/src/Symfony/Validator/Exception/ValidationException.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Exception; +namespace ApiPlatform\Symfony\Validator\Exception; -use ApiPlatform\Core\Validator\Exception\ValidationException as BaseValidationException; +use ApiPlatform\Symfony\EventListener\Exception\ValidationException as BaseValidationException; use Symfony\Component\Validator\ConstraintViolationListInterface; /** diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php similarity index 96% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php index def0b4be4bf..e100bd98bc1 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestriction.php similarity index 97% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestriction.php index 69b960c1359..257a3c4d7a2 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\Validator\Constraint; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestriction.php similarity index 93% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestriction.php index dc089d0884a..55c3b5183fb 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\Validator\Constraint; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php similarity index 96% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php index ff893763d91..8080c0a853f 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\Validator\Constraint; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestriction.php similarity index 93% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestriction.php index a4a01771ab0..26d6cf3faf9 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestriction.php similarity index 94% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestriction.php index 3bc7fe83a8e..e503704aef0 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php similarity index 94% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php index fb67ee58841..032624845b2 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestriction.php similarity index 93% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestriction.php index 78840e595e3..f2ef047a5a1 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestriction.php similarity index 93% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestriction.php index 774bcfa202c..f8d4e484897 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php similarity index 95% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php index 3f51e6d056f..f19d1c14005 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\Validator\Constraint; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php similarity index 94% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php index 572c2f153ee..4e4533d52cc 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php similarity index 93% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php index 656778f3a19..4667c228f3e 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\Validator\Constraint; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRestrictionMetadataInterface.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRestrictionMetadataInterface.php similarity index 93% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRestrictionMetadataInterface.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRestrictionMetadataInterface.php index df443e18209..a1c5e0b8b19 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRestrictionMetadataInterface.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRestrictionMetadataInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\Validator\Constraint; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestriction.php similarity index 91% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestriction.php rename to src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestriction.php index 57849bb1c1f..28610da3d99 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestriction.php +++ b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestriction.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Symfony\Validator\Metadata\Property\Restriction; use ApiPlatform\Metadata\ApiProperty; use Symfony\Component\Validator\Constraint; diff --git a/src/Core/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php b/src/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php similarity index 97% rename from src/Core/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php rename to src/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php index 2e464c1975c..6c2a66749c7 100644 --- a/src/Core/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php +++ b/src/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property; +namespace ApiPlatform\Symfony\Validator\Metadata\Property; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints\Bic; use Symfony\Component\Validator\Constraints\CardScheme; diff --git a/src/Core/Bridge/Symfony/Validator/ValidationGroupsGeneratorInterface.php b/src/Symfony/Validator/ValidationGroupsGeneratorInterface.php similarity index 92% rename from src/Core/Bridge/Symfony/Validator/ValidationGroupsGeneratorInterface.php rename to src/Symfony/Validator/ValidationGroupsGeneratorInterface.php index d8fffcef5ae..fc84521f2dd 100644 --- a/src/Core/Bridge/Symfony/Validator/ValidationGroupsGeneratorInterface.php +++ b/src/Symfony/Validator/ValidationGroupsGeneratorInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator; +namespace ApiPlatform\Symfony\Validator; use Symfony\Component\Validator\Constraints\GroupSequence; diff --git a/src/Core/Bridge/Symfony/Validator/Validator.php b/src/Symfony/Validator/Validator.php similarity index 92% rename from src/Core/Bridge/Symfony/Validator/Validator.php rename to src/Symfony/Validator/Validator.php index fb4b2cec43e..b9442651840 100644 --- a/src/Core/Bridge/Symfony/Validator/Validator.php +++ b/src/Symfony/Validator/Validator.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Bridge\Symfony\Validator; +namespace ApiPlatform\Symfony\Validator; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; -use ApiPlatform\Core\Validator\ValidatorInterface; +use ApiPlatform\Symfony\EventListener\ValidatorInterface; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; use Psr\Container\ContainerInterface; use Symfony\Component\Validator\Constraints\GroupSequence; use Symfony\Component\Validator\Validator\ValidatorInterface as SymfonyValidatorInterface; diff --git a/src/Core/Test/DoctrineMongoDbOdmFilterTestCase.php b/src/Test/DoctrineMongoDbOdmFilterTestCase.php similarity index 96% rename from src/Core/Test/DoctrineMongoDbOdmFilterTestCase.php rename to src/Test/DoctrineMongoDbOdmFilterTestCase.php index 259e0d55b6c..b7c312a03cf 100644 --- a/src/Core/Test/DoctrineMongoDbOdmFilterTestCase.php +++ b/src/Test/DoctrineMongoDbOdmFilterTestCase.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Test; +namespace ApiPlatform\Test; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\FilterInterface; +use ApiPlatform\Doctrine\Odm\Filter\FilterInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Document\Dummy; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; diff --git a/src/Core/Test/DoctrineMongoDbOdmSetup.php b/src/Test/DoctrineMongoDbOdmSetup.php similarity index 99% rename from src/Core/Test/DoctrineMongoDbOdmSetup.php rename to src/Test/DoctrineMongoDbOdmSetup.php index 6084576271e..66e30bf815f 100644 --- a/src/Core/Test/DoctrineMongoDbOdmSetup.php +++ b/src/Test/DoctrineMongoDbOdmSetup.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Test; +namespace ApiPlatform\Test; use Doctrine\Common\Cache\ArrayCache; use Doctrine\Common\Cache\Cache; diff --git a/src/Core/Test/DoctrineMongoDbOdmTestCase.php b/src/Test/DoctrineMongoDbOdmTestCase.php similarity index 98% rename from src/Core/Test/DoctrineMongoDbOdmTestCase.php rename to src/Test/DoctrineMongoDbOdmTestCase.php index ae357dd949d..aa2d7c61a85 100644 --- a/src/Core/Test/DoctrineMongoDbOdmTestCase.php +++ b/src/Test/DoctrineMongoDbOdmTestCase.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Test; +namespace ApiPlatform\Test; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\Cache\ArrayCache; diff --git a/src/Core/Test/DoctrineOrmFilterTestCase.php b/src/Test/DoctrineOrmFilterTestCase.php similarity index 96% rename from src/Core/Test/DoctrineOrmFilterTestCase.php rename to src/Test/DoctrineOrmFilterTestCase.php index 792674a4e4e..242b094ca21 100644 --- a/src/Core/Test/DoctrineOrmFilterTestCase.php +++ b/src/Test/DoctrineOrmFilterTestCase.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Test; +namespace ApiPlatform\Test; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\FilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; +use ApiPlatform\Doctrine\Orm\Filter\FilterInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use Doctrine\ORM\EntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Core/Util/AnnotationFilterExtractorTrait.php b/src/Util/AnnotationFilterExtractorTrait.php similarity index 99% rename from src/Core/Util/AnnotationFilterExtractorTrait.php rename to src/Util/AnnotationFilterExtractorTrait.php index 54ed586a0df..a4656ea19a8 100644 --- a/src/Core/Util/AnnotationFilterExtractorTrait.php +++ b/src/Util/AnnotationFilterExtractorTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use ApiPlatform\Core\Annotation\ApiFilter; use Doctrine\Common\Annotations\Reader; diff --git a/src/Core/Util/ArrayTrait.php b/src/Util/ArrayTrait.php similarity index 96% rename from src/Core/Util/ArrayTrait.php rename to src/Util/ArrayTrait.php index 788ddac2c49..f17486cd9f8 100644 --- a/src/Core/Util/ArrayTrait.php +++ b/src/Util/ArrayTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; trait ArrayTrait { diff --git a/src/Core/Util/AttributesExtractor.php b/src/Util/AttributesExtractor.php similarity index 98% rename from src/Core/Util/AttributesExtractor.php rename to src/Util/AttributesExtractor.php index 17ae26a9d65..b020c63065f 100644 --- a/src/Core/Util/AttributesExtractor.php +++ b/src/Util/AttributesExtractor.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use ApiPlatform\Core\Api\OperationType; diff --git a/src/Core/Cache/CachedTrait.php b/src/Util/CachedTrait.php similarity index 97% rename from src/Core/Cache/CachedTrait.php rename to src/Util/CachedTrait.php index a5a5b3adf82..abe06aca934 100644 --- a/src/Core/Cache/CachedTrait.php +++ b/src/Util/CachedTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Cache; +namespace ApiPlatform\Util; use Psr\Cache\CacheException; use Psr\Cache\CacheItemPoolInterface; diff --git a/src/Core/Util/ClassInfoTrait.php b/src/Util/ClassInfoTrait.php similarity index 97% rename from src/Core/Util/ClassInfoTrait.php rename to src/Util/ClassInfoTrait.php index c5bb7c98e33..9bb039ec863 100644 --- a/src/Core/Util/ClassInfoTrait.php +++ b/src/Util/ClassInfoTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; /** * Retrieves information about a class. diff --git a/src/Core/Util/CloneTrait.php b/src/Util/CloneTrait.php similarity index 95% rename from src/Core/Util/CloneTrait.php rename to src/Util/CloneTrait.php index 80f4b71843d..51623aecb41 100644 --- a/src/Core/Util/CloneTrait.php +++ b/src/Util/CloneTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; /** * Clones given data if cloneable. diff --git a/src/Core/Util/CorsTrait.php b/src/Util/CorsTrait.php similarity index 95% rename from src/Core/Util/CorsTrait.php rename to src/Util/CorsTrait.php index e5f48925f21..c55ce2584c0 100644 --- a/src/Core/Util/CorsTrait.php +++ b/src/Util/CorsTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Util/ErrorFormatGuesser.php b/src/Util/ErrorFormatGuesser.php similarity index 97% rename from src/Core/Util/ErrorFormatGuesser.php rename to src/Util/ErrorFormatGuesser.php index 31428092b12..a42e1fb5b34 100644 --- a/src/Core/Util/ErrorFormatGuesser.php +++ b/src/Util/ErrorFormatGuesser.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Util/Inflector.php b/src/Util/Inflector.php similarity index 97% rename from src/Core/Util/Inflector.php rename to src/Util/Inflector.php index 6b2e607b1e6..85fdf60f0e2 100644 --- a/src/Core/Util/Inflector.php +++ b/src/Util/Inflector.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use Doctrine\Common\Inflector\Inflector as LegacyInflector; use Doctrine\Inflector\Inflector as InflectorObject; diff --git a/src/Core/Util/IriHelper.php b/src/Util/IriHelper.php similarity index 99% rename from src/Core/Util/IriHelper.php rename to src/Util/IriHelper.php index 9616f017412..7c46aeae359 100644 --- a/src/Core/Util/IriHelper.php +++ b/src/Util/IriHelper.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use ApiPlatform\Core\Api\UrlGeneratorInterface; use ApiPlatform\Exception\InvalidArgumentException; diff --git a/src/Core/Util/Reflection.php b/src/Util/Reflection.php similarity index 96% rename from src/Core/Util/Reflection.php rename to src/Util/Reflection.php index 127d2c9a120..97a6880b41a 100644 --- a/src/Core/Util/Reflection.php +++ b/src/Util/Reflection.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; /** * Reflection utilities. diff --git a/src/Core/Util/ReflectionClassRecursiveIterator.php b/src/Util/ReflectionClassRecursiveIterator.php similarity index 98% rename from src/Core/Util/ReflectionClassRecursiveIterator.php rename to src/Util/ReflectionClassRecursiveIterator.php index fc27c1e8c39..8215c532c11 100644 --- a/src/Core/Util/ReflectionClassRecursiveIterator.php +++ b/src/Util/ReflectionClassRecursiveIterator.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; /** * Gets reflection classes for php files in the given directories. diff --git a/src/Core/Util/RequestAttributesExtractor.php b/src/Util/RequestAttributesExtractor.php similarity index 96% rename from src/Core/Util/RequestAttributesExtractor.php rename to src/Util/RequestAttributesExtractor.php index ebb8b94fbe3..8565e922e92 100644 --- a/src/Core/Util/RequestAttributesExtractor.php +++ b/src/Util/RequestAttributesExtractor.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Util/RequestParser.php b/src/Util/RequestParser.php similarity index 99% rename from src/Core/Util/RequestParser.php rename to src/Util/RequestParser.php index d573dbcb553..5d76abca243 100644 --- a/src/Core/Util/RequestParser.php +++ b/src/Util/RequestParser.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Core/Util/ResourceClassInfoTrait.php b/src/Util/ResourceClassInfoTrait.php similarity index 98% rename from src/Core/Util/ResourceClassInfoTrait.php rename to src/Util/ResourceClassInfoTrait.php index a051fe1c03e..9a018aa6c05 100644 --- a/src/Core/Util/ResourceClassInfoTrait.php +++ b/src/Util/ResourceClassInfoTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; diff --git a/src/Core/Util/SortTrait.php b/src/Util/SortTrait.php similarity index 95% rename from src/Core/Util/SortTrait.php rename to src/Util/SortTrait.php index 56a23fae9af..04a8a31917c 100644 --- a/src/Core/Util/SortTrait.php +++ b/src/Util/SortTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Util; +namespace ApiPlatform\Util; /** * Sort helper methods. diff --git a/src/deprecated_interfaces.php b/src/deprecated_interfaces.php new file mode 100644 index 00000000000..9b43b8497ca --- /dev/null +++ b/src/deprecated_interfaces.php @@ -0,0 +1,96 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +return [ + // Bridge\Doctrine => Doctrine + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterInterface::class => ApiPlatform\Doctrine\Common\Filter\DateFilterInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterInterface::class => ApiPlatform\Doctrine\Common\Filter\ExistsFilterInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterInterface::class => ApiPlatform\Doctrine\Common\Filter\OrderFilterInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterInterface::class => ApiPlatform\Doctrine\Common\Filter\RangeFilterInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterInterface::class => ApiPlatform\Doctrine\Common\Filter\SearchFilterInterface::class, + + // Bridge\Doctrine\MongoDbOdm => Doctrine\Odm + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface::class => ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface::class => ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultCollectionExtensionInterface::class => ApiPlatform\Doctrine\Odm\Extension\AggregationResultCollectionExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultItemExtensionInterface::class => ApiPlatform\Doctrine\Odm\Extension\AggregationResultItemExtensionInterface::class, + + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\FilterInterface::class => ApiPlatform\Doctrine\Odm\Filter\FilterInterface::class, + + // Bridge\Doctrine\Orm => Doctrine\Orm + ApiPlatform\Core\Bridge\Doctrine\Orm\QueryAwareInterface::class => ApiPlatform\Doctrine\Orm\QueryAwareInterface::class, + + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\ContextAwareQueryCollectionExtensionInterface::class => ApiPlatform\Doctrine\Orm\Extension\ContextAwareQueryCollectionExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\ContextAwareQueryResultCollectionExtensionInterface::class => ApiPlatform\Doctrine\Orm\Extension\ContextAwareQueryResultCollectionExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\ContextAwareQueryResultItemExtensionInterface::class => ApiPlatform\Doctrine\Orm\Extension\ContextAwareQueryResultItemExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface::class => ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface::class => ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface::class => ApiPlatform\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultItemExtensionInterface::class => ApiPlatform\Doctrine\Orm\Extension\QueryResultItemExtensionInterface::class, + + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\ContextAwareFilterInterface::class => ApiPlatform\Doctrine\Orm\Filter\ContextAwareFilterInterface::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\FilterInterface::class => ApiPlatform\Doctrine\Orm\Filter\FilterInterface::class, + + ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface::class => ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface::class, + + // Bridge\Elasticsearch => Elasticsearch + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface::class => ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface::class, + + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\ConstantScoreFilterExtension::class => ApiPlatform\Elasticsearch\Filter\ConstantScoreFilterInterface::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\FilterInterface::class => ApiPlatform\Elasticsearch\Filter\FilterInterface::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\SortFilterInterface::class => ApiPlatform\Elasticsearch\Filter\SortFilterInterface::class, + + ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface::class => ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface::class, + + // Bridge\Symfony\Validator + ApiPlatform\Core\Bridge\Symfony\Validator\ValidationGroupsGeneratorInterface::class => ApiPlatform\Symfony\Validator\ValidationGroupsGeneratorInterface::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ConstraintViolationListAwareExceptionInterface::class => ApiPlatform\Symfony\Validator\Exception\ConstraintViolationListAwareExceptionInterface::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface::class, + + // DataProvider => State/Pagination + ApiPlatform\Core\DataProvider\PaginatorInterface::class => ApiPlatform\State\Pagination\PaginatorInterface::class, + ApiPlatform\Core\DataProvider\PartialPaginatorInterface::class => ApiPlatform\State\Pagination\PartialPaginatorInterface::class, + + // DataTransformer + ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface::class => ApiPlatform\DataTransformer\DataTransformerInitializerInterface::class, + ApiPlatform\Core\DataTransformer\DataTransformerInterface::class => ApiPlatform\DataTransformer\DataTransformerInterface::class, + + // Documentation + ApiPlatform\Core\Documentation\DocumentationInterface::class => ApiPlatform\Documentation\DocumentationInterface::class, + + // HttpCache + ApiPlatform\Core\HttpCache\PurgerInterface::class => ApiPlatform\HttpCache\PurgerInterface::class, + + // JsonLd + ApiPlatform\Core\JsonLd\AnonymousContextBuilderInterface::class => ApiPlatform\JsonLd\AnonymousContextBuilderInterface::class, + ApiPlatform\Core\JsonLd\ContextBuilderInterface::class => ApiPlatform\JsonLd\ContextBuilderInterface::class, + + // JsonSchema + ApiPlatform\Core\JsonSchema\SchemaFactoryInterface::class => ApiPlatform\JsonSchema\SchemaFactoryInterface::class, + ApiPlatform\Core\JsonSchema\TypeFactoryInterface::class => ApiPlatform\JsonSchema\TypeFactoryInterface::class, + + // OpenApi + ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface::class => ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface::class, + + // PathResolver + ApiPlatform\Core\PathResolver\OperationPathResolverInterface::class => ApiPlatform\PathResolver\OperationPathResolverInterface::class, + + // Security => Symfony/Security + ApiPlatform\Core\Security\ResourceAccessCheckerInterface::class => ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface::class, + + // Serializer + ApiPlatform\Core\Serializer\Filter\FilterInterface::class => ApiPlatform\Serializer\Filter\FilterInterface::class, + ApiPlatform\Core\Serializer\SerializerContextBuilderInterface::class => ApiPlatform\Serializer\SerializerContextBuilderInterface::class, + + ApiPlatform\Core\Validator\ValidatorInterface::class => ApiPlatform\Symfony\EventListener\ValidatorInterface::class, +]; diff --git a/src/deprecation.php b/src/deprecation.php index a83c374a739..02ba3db5596 100644 --- a/src/deprecation.php +++ b/src/deprecation.php @@ -106,8 +106,355 @@ ApiPlatform\Core\GraphQl\Type\Definition\UploadType::class => ApiPlatform\GraphQl\Type\Definition\UploadType::class, ApiPlatform\Core\GraphQl\Type\Definition\IterableType::class => ApiPlatform\GraphQl\Type\Definition\IterableType::class, ApiPlatform\Core\GraphQl\Type\TypesContainer::class => ApiPlatform\GraphQl\Type\TypesContainer::class, + + // Action + ApiPlatform\Core\Action\EntrypointAction::class => ApiPlatform\Action\EntrypointAction::class, + ApiPlatform\Core\Action\ExceptionAction::class => ApiPlatform\Action\ExceptionAction::class, + ApiPlatform\Core\Action\NotFoundAction::class => ApiPlatform\Action\NotFoundAction::class, + ApiPlatform\Core\Action\PlaceholderAction::class => ApiPlatform\Action\PlaceholderAction::class, + + // Bridge\Doctrine + ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait::class => ApiPlatform\Doctrine\Common\PropertyHelperTrait::class, + + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\BooleanFilterTrait::class => ApiPlatform\Doctrine\Common\Filter\BooleanFilterTrait::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\DateFilterTrait::class => ApiPlatform\Doctrine\Common\Filter\DateFilterTrait::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\ExistsFilterTrait::class => ApiPlatform\Doctrine\Common\Filter\ExistsFilterTrait::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\NumericFilterTrait::class => ApiPlatform\Doctrine\Common\Filter\NumericFilterTrait::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterTrait::class => ApiPlatform\Doctrine\Common\Filter\OrderFilterTrait::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\RangeFilterTrait::class => ApiPlatform\Doctrine\Common\Filter\RangeFilterTrait::class, + ApiPlatform\Core\Bridge\Doctrine\Common\Filter\SearchFilterTrait::class => ApiPlatform\Doctrine\Common\Filter\SearchFilterTrait::class, + + // Bridge\Doctrine\EventListener + ApiPlatform\Core\Bridge\Doctrine\EventListener\PublishMercureUpdatesListener::class => ApiPlatform\Doctrine\EventListener\PublishMercureUpdatesListener::class, + ApiPlatform\Core\Bridge\Doctrine\EventListener\PurgeHttpCacheListener::class => ApiPlatform\Doctrine\EventListener\PurgeHttpCacheListener::class, + ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener::class => ApiPlatform\Doctrine\EventListener\WriteListener::class, + + // Bridge\Doctrine\MongoDbOdm + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\FilterExtension::class => ApiPlatform\Doctrine\Odm\Extension\FilterExtension::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\OrderExtension::class => ApiPlatform\Doctrine\Orm\Extension\OrderExtension::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\PaginationExtension::class => ApiPlatform\Doctrine\Orm\Extension\PaginationExtension::class, + + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\AbstractFilter::class => ApiPlatform\Doctrine\Odm\Filter\AbstractFilter::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\BooleanFilter::class => ApiPlatform\Doctrine\Odm\Filter\BooleanFilter::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\DateFilter::class => ApiPlatform\Doctrine\Odm\Filter\DateFilter::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\ExistsFilter::class => ApiPlatform\Doctrine\Odm\Filter\ExistsFilter::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\NumericFilter::class => ApiPlatform\Doctrine\Odm\Filter\NumericFilter::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\OrderFilter::class => ApiPlatform\Doctrine\Odm\Filter\OrderFilter::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\RangeFilter::class => ApiPlatform\Doctrine\Odm\Filter\RangeFilter::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter::class => ApiPlatform\Doctrine\Odm\Filter\SearchFilter::class, + + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory::class => ApiPlatform\Doctrine\Odm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory::class, + + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\PropertyInfo\DoctrineExtractor::class => ApiPlatform\Doctrine\Odm\PropertyInfo\DoctrineExtractor::class, + + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Paginator::class => ApiPlatform\Doctrine\Odm\Paginator::class, + ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\PropertyHelperTrait::class => ApiPlatform\Doctrine\Odm\PropertyHelperTrait::class, + + // Bridge\Doctrine\Orm + ApiPlatform\Core\Bridge\Doctrine\Orm\AbstractPaginator::class => ApiPlatform\Doctrine\Orm\AbstractPaginator::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator::class => ApiPlatform\Doctrine\Orm\Paginator::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\PropertyHelperTrait::class => ApiPlatform\Doctrine\Orm\PropertyHelperTrait::class, + + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\EagerLoadingExtension::class => ApiPlatform\Doctrine\Orm\Extension\EagerLoadingExtension::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension::class => ApiPlatform\Doctrine\Orm\Extension\FilterEagerLoadingExtension::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterExtension::class => ApiPlatform\Doctrine\Orm\Extension\FilterExtension::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\OrderExtension::class => ApiPlatform\Doctrine\Orm\Extension\OrderExtension::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension::class => ApiPlatform\Doctrine\Orm\Extension\PaginationExtension::class, + + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter::class => ApiPlatform\Doctrine\Orm\Filter\AbstractContextAwareFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter::class => ApiPlatform\Doctrine\Orm\Filter\AbstractFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter::class => ApiPlatform\Doctrine\Orm\Filter\BooleanFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter::class => ApiPlatform\Doctrine\Orm\Filter\DateFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\ExistsFilter::class => ApiPlatform\Doctrine\Orm\Filter\ExistsFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\NumericFilter::class => ApiPlatform\Doctrine\Orm\Filter\NumericFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter::class => ApiPlatform\Doctrine\Orm\Filter\OrderFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\RangeFilter::class => ApiPlatform\Doctrine\Orm\Filter\RangeFilter::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter::class => ApiPlatform\Doctrine\Orm\Filter\SearchFilter::class, + + ApiPlatform\Core\Bridge\Doctrine\Orm\Util\EagerLoadingTrait::class => ApiPlatform\Doctrine\Orm\Util\EagerLoadingTrait::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper::class => ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::class => ApiPlatform\Doctrine\Orm\Util\QueryChecker::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::class => ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::class, + ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator::class => ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator::class, + + ApiPlatform\Core\Bridge\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory::class => ApiPlatform\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory::class, + + // Bridge\Elasticsearch + ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException::class => ApiPlatform\Elasticsearch\Exception\IndexNotFoundException::class, + ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException::class => ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException::class, + + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\AbstractFilterExtension::class => ApiPlatform\Elasticsearch\Extension\AbstractFilterExtension::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\ConstantScoreFilterExtension::class => ApiPlatform\Elasticsearch\Extension\ConstantScoreFilterExtension::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\SortExtension::class => ApiPlatform\Elasticsearch\Extension\SortExtension::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\SortFilterExtension::class => ApiPlatform\Elasticsearch\Extension\SortFilterExtension::class, + + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\AbstractFilter::class => ApiPlatform\Elasticsearch\Filter\AbstractFilter::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\AbstractSearchFilter::class => ApiPlatform\Elasticsearch\Filter\AbstractSearchFilter::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\MatchFilter::class => ApiPlatform\Elasticsearch\Filter\MatchFilter::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\OrderFilter::class => ApiPlatform\Elasticsearch\Filter\OrderFilter::class, + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\TermFilter::class => ApiPlatform\Elasticsearch\Filter\TermFilter::class, + + ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\AttributeDocumentMetadataFactory::class => ApiPlatform\Elasticsearch\Metadata\Document\Factory\AttributeDocumentMetadataFactory::class, + ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\CachedDocumentMetadataFactory::class => ApiPlatform\Elasticsearch\Metadata\Document\Factory\CachedDocumentMetadataFactory::class, + ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\CatDocumentMetadataFactory::class => ApiPlatform\Elasticsearch\Metadata\Document\Factory\CatDocumentMetadataFactory::class, + ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\ConfiguredDocumentMetadataFactory::class => ApiPlatform\Elasticsearch\Metadata\Document\Factory\ConfiguredDocumentMetadataFactory::class, + ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata::class => ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata::class, + + ApiPlatform\Core\Bridge\Elasticsearch\Serializer\NameConverter\InnerFieldsNameConverter::class => ApiPlatform\Elasticsearch\Serializer\NameConverter\InnerFieldsNameConverter::class, + ApiPlatform\Core\Bridge\Elasticsearch\Serializer\DocumentNormalizer::class => ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer::class, + ApiPlatform\Core\Bridge\Elasticsearch\Serializer\ItemNormalizer::class => ApiPlatform\Elasticsearch\Serializer\ItemNormalizer::class, + ApiPlatform\Core\Bridge\Elasticsearch\Util\FieldDatatypeTrait::class => ApiPlatform\Elasticsearch\Util\FieldDatatypeTrait::class, + + ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Paginator::class => ApiPlatform\Elasticsearch\Paginator::class, + + // Bridge\RamseyUuid + ApiPlatform\Core\Bridge\RamseyUuid\Serializer\UuidDenormalizer::class => ApiPlatform\RamseyUuid\Serializer\UuidDenormalizer::class, + + // Bridge\Symfony\Bundle + ApiPlatform\Core\Bridge\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver::class => ApiPlatform\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\CacheWarmer\CachePoolClearerCacheWarmer::class => ApiPlatform\Symfony\Bundle\CacheWarmer\CachePoolClearerCacheWarmer::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\Command\GraphQlExportCommand::class => ApiPlatform\Symfony\Bundle\Command\GraphQlExportCommand::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Command\OpenApiCommand::class => ApiPlatform\Symfony\Bundle\Command\OpenApiCommand::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\DataCollector\RequestDataCollector::class => ApiPlatform\Symfony\Bundle\DataCollector\RequestDataCollector::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\FilterPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\FilterPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\ApiPlatformExtension::class => ApiPlatform\Symfony\Bundle\DependencyInjection\ApiPlatformExtension::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Configuration::class => ApiPlatform\Symfony\Bundle\DependencyInjection\Configuration::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\EventListener\SwaggerUiListener::class => ApiPlatform\Symfony\Bundle\EventListener\SwaggerUiListener::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\Processor\TraceableChainProcessor::class => ApiPlatform\Symfony\Bundle\Processor\TraceableChainProcessor::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiAction::class => ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiAction::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiContext::class => ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiContext::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubset::class => ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubset::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubsetLegacy::class => ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubsetLegacy::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubsetTrait::class => ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubsetTrait::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubsetV9::class => ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubsetV9::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\MatchesJsonSchema::class => ApiPlatform\Symfony\Bundle\Test\Constraint\MatchesJsonSchema::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestAssertionsTrait::class => ApiPlatform\Symfony\Bundle\Test\ApiTestAssertionsTrait::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestCase::class => ApiPlatform\Symfony\Bundle\Test\ApiTestCase::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\BrowserKitAssertionsTrait::class => ApiPlatform\Symfony\Bundle\Test\BrowserKitAssertionsTrait::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Client::class => ApiPlatform\Symfony\Bundle\Test\Client::class, + ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Response::class => ApiPlatform\Symfony\Bundle\Test\Response::class, + + ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class, + + // Bridge\Symfony\Messenger + ApiPlatform\Core\Bridge\Symfony\Messenger\ContextStamp::class => ApiPlatform\Symfony\Messenger\ContextStamp::class, + ApiPlatform\Core\Bridge\Symfony\Messenger\DispatchTrait::class => ApiPlatform\Symfony\Messenger\DispatchTrait::class, + ApiPlatform\Core\Bridge\Symfony\Messenger\DataTransformer::class => ApiPlatform\Symfony\Messenger\DataTransformer::class, + ApiPlatform\Core\Bridge\Symfony\Messenger\RemoveStamp::class => ApiPlatform\Symfony\Messenger\RemoveStamp::class, + + // Bridge\Symfony\PropertyInfo\Metadata\Property => Metadata\Property + ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyMetadataFactory::class => ApiPlatform\Metadata\Property\PropertyInfoPropertyMetadataFactory::class, + ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyNameCollectionFactory::class => ApiPlatform\Metadata\Property\PropertyInfoPropertyNameCollectionFactory::class, + + // Bridge\Symfony\Routing + ApiPlatform\Core\Bridge\Symfony\Routing\ApiLoader::class => ApiPlatform\Symfony\Routing\ApiLoader::class, + ApiPlatform\Core\Bridge\Symfony\Routing\Router::class => ApiPlatform\Symfony\Routing\Router::class, + + // Bridge\Symfony\Validator + ApiPlatform\Core\Bridge\Symfony\Validator\EventListener\ValidationExceptionListener::class => ApiPlatform\Symfony\Validator\EventListener\ValidationExceptionListener::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException::class => ApiPlatform\Symfony\Validator\Exception\ValidationException::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Validator::class => ApiPlatform\Symfony\Validator\Validator::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaChoiceRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaChoiceRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCollectionRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCollectionRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCountRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCountRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanOrEqualRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanOrEqualRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanOrEqualRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanOrEqualRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaOneOfRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaOneOfRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRangeRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRangeRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaUniqueRestriction::class => ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaUniqueRestriction::class, + ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\ValidatorPropertyMetadataFactory::class => ApiPlatform\Symfony\Validator\Metadata\Property\ValidatorPropertyMetadataFactory::class, + + // Cache + ApiPlatform\Core\Cached\CachedTrait::class => ApiPlatform\Util\CachedTrait::class, + + // DataProvider => State/Pagination + ApiPlatform\Core\DataProvider\ArrayPaginator::class => ApiPlatform\State\Pagination\ArrayPaginator::class, + ApiPlatform\Core\DataProvider\Pagination::class => ApiPlatform\State\Pagination\Pagination::class, + ApiPlatform\Core\DataProvider\PaginationOptions::class => ApiPlatform\State\Pagination\PaginationOptions::class, + ApiPlatform\Core\DataProvider\TraversablePaginator::class => ApiPlatform\State\Pagination\TraversablePaginator::class, + + // Documentation + ApiPlatform\Core\Documentation\Action\DocumentationAction::class => ApiPlatform\Documentation\Action\DocumentationAction::class, + ApiPlatform\Core\Documentation\Documentation::class => ApiPlatform\Documentation\Documentation::class, + + // EventListener => Symfony/EventListener + ApiPlatform\Core\EventListener\AddFormatListener::class => ApiPlatform\Symfony\EventListener\AddFormatListener::class, + ApiPlatform\Core\EventListener\DeserializeListener::class => ApiPlatform\Symfony\EventListener\DeserializeListener::class, + ApiPlatform\Core\EventListener\EventPriorities::class => ApiPlatform\Symfony\EventListener\EventPriorities::class, + ApiPlatform\Core\EventListener\ExceptionListener::class => ApiPlatform\Symfony\EventListener\ExceptionListener::class, + ApiPlatform\Core\EventListener\QueryParameterValidateListener::class => ApiPlatform\Symfony\EventListener\QueryParameterValidateListener::class, + ApiPlatform\Core\EventListener\RespondListener::class => ApiPlatform\Symfony\EventListener\RespondListener::class, + ApiPlatform\Core\EventListener\SerializeListener::class => ApiPlatform\Symfony\EventListener\SerializeListener::class, + + // Hal + ApiPlatform\Core\Hal\JsonSchema\SchemaFactory::class => ApiPlatform\Hal\JsonSchema\SchemaFactory::class, + ApiPlatform\Core\Hal\Serializer\CollectionNormalizer::class => ApiPlatform\Hal\Serializer\CollectionNormalizer::class, + ApiPlatform\Core\Hal\Serializer\EntrypointNormalizer::class => ApiPlatform\Hal\Serializer\EntrypointNormalizer::class, + ApiPlatform\Core\Hal\Serializer\ItemNormalizer::class => ApiPlatform\Hal\Serializer\ItemNormalizer::class, + ApiPlatform\Core\Hal\Serializer\ObjectNormalizer::class => ApiPlatform\Hal\Serializer\ObjectNormalizer::class, + + // HttpCache + ApiPlatform\Core\HttpCache\EventListener\AddHeadersListener::class => ApiPlatform\HttpCache\EventListener\AddHeadersListener::class, + ApiPlatform\Core\HttpCache\EventListener\AddTagsListener::class => ApiPlatform\HttpCache\EventListener\AddTagsListener::class, + ApiPlatform\Core\HttpCache\VarnishPurger::class => ApiPlatform\HttpCache\VarnishPurger::class, + ApiPlatform\Core\HttpCache\VarnishXKeyPurger::class => ApiPlatform\HttpCache\VarnishXKeyPurger::class, + + // Hydra + ApiPlatform\Core\Hydra\EventListener\AddLinkHeaderListener::class => ApiPlatform\Hydra\EventListener\AddLinkHeaderListener::class, + ApiPlatform\Core\Hydra\JsonSchema\SchemaFactory::class => ApiPlatform\Hydra\JsonSchema\SchemaFactory::class, + ApiPlatform\Core\Hydra\Serializer\CollectionFiltersNormalizer::class => ApiPlatform\Hydra\Serializer\CollectionFiltersNormalizer::class, + ApiPlatform\Core\Hydra\Serializer\CollectionNormalizer::class => ApiPlatform\Hydra\Serializer\CollectionNormalizer::class, + ApiPlatform\Core\Hydra\Serializer\ConstraintViolationListNormalizer::class => ApiPlatform\Hydra\Serializer\ConstraintViolationListNormalizer::class, + ApiPlatform\Core\Hydra\Serializer\DocumentationNormalizer::class => ApiPlatform\Hydra\Serializer\DocumentationNormalizer::class, + ApiPlatform\Core\Hydra\Serializer\EntrypointNormalizer::class => ApiPlatform\Hydra\Serializer\EntrypointNormalizer::class, + ApiPlatform\Core\Hydra\Serializer\ErrorNormalizer::class => ApiPlatform\Hydra\Serializer\ErrorNormalizer::class, + ApiPlatform\Core\Hydra\Serializer\PartialCollectionViewNormalizer::class => ApiPlatform\Hydra\Serializer\PartialCollectionViewNormalizer::class, + + // JsonApi/EventListener => Symfony/EventListener + ApiPlatform\Core\JsonApi\EventListener\TransformFieldsetsParametersListener::class => ApiPlatform\Symfony\EventListener\JsonApi\TransformFieldsetsParametersListener::class, + ApiPlatform\Core\JsonApi\EventListener\TransformFilteringParametersListener::class => ApiPlatform\Symfony\EventListener\JsonApi\TransformFilteringParametersListener::class, + ApiPlatform\Core\JsonApi\EventListener\TransformPaginationParametersListener::class => ApiPlatform\Symfony\EventListener\JsonApi\TransformPaginationParametersListener::class, + ApiPlatform\Core\JsonApi\EventListener\TransformSortingParametersListener::class => ApiPlatform\Symfony\EventListener\JsonApi\TransformSortingParametersListener::class, + + // JsonApi/Serializer + ApiPlatform\Core\JsonApi\Serializer\CollectionNormalizer::class => ApiPlatform\JsonApi\Serializer\CollectionNormalizer::class, + ApiPlatform\Core\JsonApi\Serializer\ConstraintViolationListNormalizer::class => ApiPlatform\JsonApi\Serializer\ConstraintViolationListNormalizer::class, + ApiPlatform\Core\JsonApi\Serializer\EntrypointNormalizer::class => ApiPlatform\JsonApi\Serializer\EntrypointNormalizer::class, + ApiPlatform\Core\JsonApi\Serializer\ErrorNormalizer::class => ApiPlatform\JsonApi\Serializer\ErrorNormalizer::class, + ApiPlatform\Core\JsonApi\Serializer\ItemNormalizer::class => ApiPlatform\JsonApi\Serializer\ItemNormalizer::class, + ApiPlatform\Core\JsonApi\Serializer\ObjectNormalizer::class => ApiPlatform\JsonApi\Serializer\ObjectNormalizer::class, + ApiPlatform\Core\JsonApi\Serializer\ReservedAttributeNameConverter::class => ApiPlatform\JsonApi\Serializer\ReservedAttributeNameConverter::class, + + // JsonLd + ApiPlatform\Core\JsonLd\Action\ContextAction::class => ApiPlatform\JsonLd\Action\ContextAction::class, + ApiPlatform\Core\JsonLd\Serializer\ItemNormalizer::class => ApiPlatform\JsonLd\Serializer\ItemNormalizer::class, + ApiPlatform\Core\JsonLd\Serializer\JsonLdContextTrait::class => ApiPlatform\JsonLd\Serializer\JsonLdContextTrait::class, + ApiPlatform\Core\JsonLd\Serializer\ObjectNormalizer::class => ApiPlatform\JsonLd\Serializer\ObjectNormalizer::class, + ApiPlatform\Core\JsonLd\ContextBuilder::class => ApiPlatform\JsonLd\ContextBuilder::class, + + // JsonSchema + ApiPlatform\Core\JsonSchema\Command\JsonSchemaGenerateCommand::class => ApiPlatform\JsonSchema\Command\JsonSchemaGenerateCommand::class, + ApiPlatform\Core\JsonSchema\Schema::class => ApiPlatform\JsonSchema\Schema::class, + ApiPlatform\Core\JsonSchema\SchemaFactory::class => ApiPlatform\JsonSchema\SchemaFactory::class, + ApiPlatform\Core\JsonSchema\TypeFactory::class => ApiPlatform\JsonSchema\TypeFactory::class, + + // Mercure/EventListener => Symfony/EventListener + ApiPlatform\Core\Mercure\EventListener\AddLinkHeaderListener::class => ApiPlatform\Symfony\EventListener\AddLinkHeaderListener::class, + + // OpenApi + ApiPlatform\Core\OpenApi\Model\Components::class => ApiPlatform\OpenApi\Model\Components::class, + ApiPlatform\Core\OpenApi\Model\Contact::class => ApiPlatform\OpenApi\Model\Contact::class, + ApiPlatform\Core\OpenApi\Model\Encoding::class => ApiPlatform\OpenApi\Model\Encoding::class, + ApiPlatform\Core\OpenApi\Model\ExtensionTrait::class => ApiPlatform\OpenApi\Model\ExtensionTrait::class, + ApiPlatform\Core\OpenApi\Model\ExternalDocumentation::class => ApiPlatform\OpenApi\Model\ExternalDocumentation::class, + ApiPlatform\Core\OpenApi\Model\Info::class => ApiPlatform\OpenApi\Model\Info::class, + ApiPlatform\Core\OpenApi\Model\License::class => ApiPlatform\OpenApi\Model\License::class, + ApiPlatform\Core\OpenApi\Model\Link::class => ApiPlatform\OpenApi\Model\Link::class, + ApiPlatform\Core\OpenApi\Model\MediaType::class => ApiPlatform\OpenApi\Model\MediaType::class, + ApiPlatform\Core\OpenApi\Model\OAuthFlow::class => ApiPlatform\OpenApi\Model\OAuthFlow::class, + ApiPlatform\Core\OpenApi\Model\OAuthFlows::class => ApiPlatform\OpenApi\Model\OAuthFlows::class, + ApiPlatform\Core\OpenApi\Model\Parameter::class => ApiPlatform\OpenApi\Model\Parameter::class, + ApiPlatform\Core\OpenApi\Model\Paths::class => ApiPlatform\OpenApi\Model\Paths::class, + ApiPlatform\Core\OpenApi\Model\RequestBody::class => ApiPlatform\OpenApi\Model\RequestBody::class, + ApiPlatform\Core\OpenApi\Model\Response::class => ApiPlatform\OpenApi\Model\Response::class, + ApiPlatform\Core\OpenApi\Model\Schema::class => ApiPlatform\OpenApi\Model\Schema::class, + ApiPlatform\Core\OpenApi\Model\SecurityScheme::class => ApiPlatform\OpenApi\Model\SecurityScheme::class, + ApiPlatform\Core\OpenApi\Model\Server::class => ApiPlatform\OpenApi\Model\Server::class, + ApiPlatform\Core\OpenApi\Serializer\OpenApiNormalizer::class => ApiPlatform\OpenApi\Serializer\OpenApiNormalizer::class, + ApiPlatform\Core\OpenApi\OpenApi::class => ApiPlatform\OpenApi\OpenApi::class, + ApiPlatform\Core\OpenApi\Options::class => ApiPlatform\OpenApi\Options::class, + + // PathResolver + ApiPlatform\Core\PathResolver\CustomOperationPathResolver::class => ApiPlatform\PathResolver\CustomOperationPathResolver::class, + ApiPlatform\Core\PathResolver\OperationPathResolver::class => ApiPlatform\PathResolver\OperationPathResolver::class, + + // Problem + ApiPlatform\Core\Problem\Serializer\ConstraintViolationListNormalizer::class => ApiPlatform\Problem\Serializer\ConstraintViolationListNormalizer::class, + ApiPlatform\Core\Problem\Serializer\ErrorNormalizer::class => ApiPlatform\Problem\Serializer\ErrorNormalizer::class, + ApiPlatform\Core\Problem\Serializer\ErrorNormalizerTrait::class => ApiPlatform\Problem\Serializer\ErrorNormalizerTrait::class, + + // Security => Symfony/Security + ApiPlatform\Core\Security\Core\Authorization\ExpressionLanguageProvider::class => ApiPlatform\Symfony\Security\Core\Authorization\ExpressionLanguageProvider::class, + ApiPlatform\Core\Security\ExpressionLanguage::class => ApiPlatform\Symfony\Security\ExpressionLanguage::class, + ApiPlatform\Core\Security\ResourceAccessChecker::class => ApiPlatform\Symfony\Security\ResourceAccessChecker::class, + + // Security/EventListener => Symfony/EventListener + ApiPlatform\Core\Security\EventListener\DenyAccessListener::class => ApiPlatform\Symfony\EventListener\DenyAccessListener::class, + + // Serializer + ApiPlatform\Core\Serializer\Filter\GroupFilter::class => ApiPlatform\Serializer\Filter\GroupFilter::class, + ApiPlatform\Core\Serializer\Filter\PropertyFilter::class => ApiPlatform\Serializer\Filter\PropertyFilter::class, + ApiPlatform\Core\Serializer\Mapping\Factory\ClassMetadataFactory::class => ApiPlatform\Serializer\Mapping\Factory\ClassMetadataFactory::class, + ApiPlatform\Core\Serializer\AbstractCollectionNormalizer::class => ApiPlatform\Serializer\AbstractCollectionNormalizer::class, + ApiPlatform\Core\Serializer\AbstractConstraintViolationListNormalizer::class => ApiPlatform\Serializer\AbstractConstraintViolationListNormalizer::class, + ApiPlatform\Core\Serializer\AbstractItemNormalizer::class => ApiPlatform\Serializer\AbstractItemNormalizer::class, + ApiPlatform\Core\Serializer\CacheKeyTrait::class => ApiPlatform\Serializer\CacheKeyTrait::class, + ApiPlatform\Core\Serializer\ContextTrait::class => ApiPlatform\Serializer\ContextTrait::class, + ApiPlatform\Core\Serializer\InputOutputMetadataTrait::class => ApiPlatform\Serializer\InputOutputMetadataTrait::class, + ApiPlatform\Core\Serializer\ItemNormalizer::class => ApiPlatform\Serializer\ItemNormalizer::class, + ApiPlatform\Core\Serializer\JsonEncoder::class => ApiPlatform\Serializer\JsonEncoder::class, + ApiPlatform\Core\Serializer\ResourceList::class => ApiPlatform\Serializer\ResourceList::class, + ApiPlatform\Core\Serializer\SerializerContextBuilder::class => ApiPlatform\Serializer\SerializerContextBuilder::class, + ApiPlatform\Core\Serializer\SerializerFilterContextBuilder::class => ApiPlatform\Serializer\SerializerFilterContextBuilder::class, + + // Swagger/Serializer => OpenApi/Serializer + ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer::class => ApiPlatform\OpenApi\Serializer\ApiGatewayNormalizer::class, + + // Test + ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase::class => ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase::class, + ApiPlatform\Core\Test\DoctrineMongoDbOdmSetup::class => ApiPlatform\Test\DoctrineMongoDbOdmSetup::class, + ApiPlatform\Core\Test\DoctrineMongoDbOdmTestCase::class => ApiPlatform\Test\DoctrineMongoDbOdmTestCase::class, + ApiPlatform\Core\Test\DoctrineOrmFilterTestCase::class => ApiPlatform\Test\DoctrineOrmFilterTestCase::class, + + // Util + ApiPlatform\Core\Util\AnnotationFilterExtractorTrait::class => ApiPlatform\Util\AnnotationFilterExtractorTrait::class, + ApiPlatform\Core\Util\ArrayTrait::class => ApiPlatform\Util\ArrayTrait::class, + ApiPlatform\Core\Util\AttributesExtractor::class => ApiPlatform\Util\AttributesExtractor::class, + ApiPlatform\Core\Util\ClassInfoTrait::class => ApiPlatform\Util\ClassInfoTrait::class, + ApiPlatform\Core\Util\CloneTrait::class => ApiPlatform\Util\CloneTrait::class, + ApiPlatform\Core\Util\CorsTrait::class => ApiPlatform\Util\CorsTrait::class, + ApiPlatform\Core\Util\ErrorFormatGuesser::class => ApiPlatform\Util\ErrorFormatGuesser::class, + ApiPlatform\Core\Util\Inflector::class => ApiPlatform\Util\Inflector::class, + ApiPlatform\Core\Util\IriHelper::class => ApiPlatform\Util\IriHelper::class, + ApiPlatform\Core\Util\Reflection::class => ApiPlatform\Util\Reflection::class, + ApiPlatform\Core\Util\ReflectionClassRecursiveIterator::class => ApiPlatform\Util\ReflectionClassRecursiveIterator::class, + ApiPlatform\Core\Util\RequestAttributesExtractor::class => ApiPlatform\Util\RequestAttributesExtractor::class, + ApiPlatform\Core\Util\RequestParser::class => ApiPlatform\Util\RequestParser::class, + ApiPlatform\Core\Util\ResourceClassInfoTrait::class => ApiPlatform\Util\ResourceClassInfoTrait::class, + ApiPlatform\Core\Util\SortTrait::class => ApiPlatform\Util\SortTrait::class, + + // Validator + ApiPlatform\Core\Validator\EventListener\ValidateListener::class => ApiPlatform\Symfony\EventListener\ValidateListener::class, + ApiPlatform\Core\Validator\Exception\ValidationException::class => ApiPlatform\Symfony\EventListener\Exception\ValidationException::class, ]; + $deprecatedInterfaces = include 'deprecated_interfaces.php'; + if (ApiPlatform\Core\Metadata\Property\PropertyMetadata::class === $className) { trigger_deprecation('api-platform/core', '2.7', sprintf('The class %s is deprecated, use %s instead.', $className, ApiPlatform\Metadata\ApiProperty::class)); } @@ -126,4 +473,11 @@ class_alias($deprecatedClasses[$className], $className); return; } + + if (isset($deprecatedInterfaces[$className])) { + class_alias($deprecatedInterfaces[$className], $className); + trigger_deprecation('api-platform/core', '2.7', sprintf('The interface %s is deprecated, use %s instead.', $className, $deprecatedClasses[$className])); + + return; + } }); diff --git a/tests/Core/Action/EntrypointActionTest.php b/tests/Action/EntrypointActionTest.php similarity index 92% rename from tests/Core/Action/EntrypointActionTest.php rename to tests/Action/EntrypointActionTest.php index 194778b62e3..8793ef17698 100644 --- a/tests/Core/Action/EntrypointActionTest.php +++ b/tests/Action/EntrypointActionTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Action; +namespace ApiPlatform\Tests\Action; -use ApiPlatform\Core\Action\EntrypointAction; +use ApiPlatform\Action\EntrypointAction; use ApiPlatform\Core\Api\Entrypoint; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; diff --git a/tests/Core/Action/ExceptionActionTest.php b/tests/Action/ExceptionActionTest.php similarity index 99% rename from tests/Core/Action/ExceptionActionTest.php rename to tests/Action/ExceptionActionTest.php index 13038d8a36d..57d3c0734eb 100644 --- a/tests/Core/Action/ExceptionActionTest.php +++ b/tests/Action/ExceptionActionTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Action; +namespace ApiPlatform\Tests\Action; -use ApiPlatform\Core\Action\ExceptionAction; +use ApiPlatform\Action\ExceptionAction; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; diff --git a/tests/Core/Action/PlaceholderActionTest.php b/tests/Action/PlaceholderActionTest.php similarity index 87% rename from tests/Core/Action/PlaceholderActionTest.php rename to tests/Action/PlaceholderActionTest.php index c3682239436..2068d721b84 100644 --- a/tests/Core/Action/PlaceholderActionTest.php +++ b/tests/Action/PlaceholderActionTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Action; +namespace ApiPlatform\Tests\Action; -use ApiPlatform\Core\Action\PlaceholderAction; +use ApiPlatform\Action\PlaceholderAction; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Core/Api/ResourceClassResolverTest.php b/tests/Core/Api/ResourceClassResolverTest.php index 8a3a97b15a7..ee11d12b145 100644 --- a/tests/Core/Api/ResourceClassResolverTest.php +++ b/tests/Core/Api/ResourceClassResolverTest.php @@ -14,11 +14,11 @@ namespace ApiPlatform\Tests\Api; use ApiPlatform\Core\Api\ResourceClassResolver; -use ApiPlatform\Core\DataProvider\PaginatorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\State\Pagination\PaginatorInterface; use ApiPlatform\Tests\Fixtures\DummyResourceImplementation; use ApiPlatform\Tests\Fixtures\DummyResourceInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/Behat/ElasticsearchContext.php b/tests/Core/Behat/ElasticsearchContext.php index 0058d65323e..800431174b0 100644 --- a/tests/Core/Behat/ElasticsearchContext.php +++ b/tests/Core/Behat/ElasticsearchContext.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Tests\Behat; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; use Behat\Behat\Context\Context; use Elasticsearch\Client; use Symfony\Component\Finder\Finder; diff --git a/tests/Core/Behat/JsonContext.php b/tests/Core/Behat/JsonContext.php index 5323faa32e7..944dcec738d 100644 --- a/tests/Core/Behat/JsonContext.php +++ b/tests/Core/Behat/JsonContext.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Core\Tests\Behat; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; use Behat\Gherkin\Node\PyStringNode; use Behat\Mink\Exception\ExpectationException; use Behatch\Context\JsonContext as BaseJsonContext; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php b/tests/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php similarity index 97% rename from tests/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php rename to tests/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php index 38e736e6d65..5d2105da0f1 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php +++ b/tests/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php @@ -14,9 +14,9 @@ namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm; use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\CollectionDataProvider; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GetCollection; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php b/tests/Core/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php similarity index 98% rename from tests/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php rename to tests/Core/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php index c9f8cb36e94..65d4cb23ce9 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php +++ b/tests/Core/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php @@ -13,14 +13,14 @@ namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\ItemDataProvider; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Exception\PropertyNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiProperty; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php b/tests/Core/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php similarity index 99% rename from tests/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php rename to tests/Core/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php index a0840bf758c..a663efcabee 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php +++ b/tests/Core/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php @@ -13,13 +13,13 @@ namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\SubresourceDataProvider; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Exception\ResourceClassNotSupportedException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiProperty; diff --git a/tests/Core/Bridge/Doctrine/Orm/CollectionDataProviderTest.php b/tests/Core/Bridge/Doctrine/Orm/CollectionDataProviderTest.php index 008ddcfb360..a814cb70520 100644 --- a/tests/Core/Bridge/Doctrine/Orm/CollectionDataProviderTest.php +++ b/tests/Core/Bridge/Doctrine/Orm/CollectionDataProviderTest.php @@ -14,10 +14,10 @@ namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm; use ApiPlatform\Core\Bridge\Doctrine\Orm\CollectionDataProvider; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use Doctrine\ORM\AbstractQuery; diff --git a/tests/Core/Bridge/Doctrine/Orm/ItemDataProviderTest.php b/tests/Core/Bridge/Doctrine/Orm/ItemDataProviderTest.php index 6e0383d349a..2dc17b3d72f 100644 --- a/tests/Core/Bridge/Doctrine/Orm/ItemDataProviderTest.php +++ b/tests/Core/Bridge/Doctrine/Orm/ItemDataProviderTest.php @@ -13,10 +13,7 @@ namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; use ApiPlatform\Core\Bridge\Doctrine\Orm\ItemDataProvider; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; @@ -24,6 +21,9 @@ use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\PropertyNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiProperty; diff --git a/tests/Core/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php b/tests/Core/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php index f68b144e7dc..c3043a8d7d5 100644 --- a/tests/Core/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php +++ b/tests/Core/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php @@ -13,15 +13,15 @@ namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; use ApiPlatform\Core\Bridge\Doctrine\Orm\SubresourceDataProvider; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\ResourceClassNotSupportedException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/Bridge/Elasticsearch/Api/IdentifierExtractorTest.php b/tests/Core/Bridge/Elasticsearch/Api/IdentifierExtractorTest.php index 99eae54a490..d6f3d05496e 100644 --- a/tests/Core/Bridge/Elasticsearch/Api/IdentifierExtractorTest.php +++ b/tests/Core/Bridge/Elasticsearch/Api/IdentifierExtractorTest.php @@ -16,8 +16,8 @@ use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractor; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompositeRelation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProviderTest.php b/tests/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProviderTest.php index ef91b78b613..870de242615 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProviderTest.php +++ b/tests/Core/Bridge/Elasticsearch/DataProvider/CollectionDataProviderTest.php @@ -15,18 +15,18 @@ use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\CollectionDataProvider; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Paginator; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Exception\ResourceClassNotFoundException; +use ApiPlatform\State\Pagination\Pagination; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompositeRelation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyCar; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/ItemDataProviderTest.php b/tests/Core/Bridge/Elasticsearch/DataProvider/ItemDataProviderTest.php index 860e3705d29..4d69e42b9c4 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/ItemDataProviderTest.php +++ b/tests/Core/Bridge/Elasticsearch/DataProvider/ItemDataProviderTest.php @@ -15,15 +15,15 @@ use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\ItemDataProvider; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\DocumentNormalizer; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; +use ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompositeRelation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProviderTest.php b/tests/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProviderTest.php index b0ae72aeae8..f992a37e890 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProviderTest.php +++ b/tests/Core/Bridge/Elasticsearch/DataProvider/SubresourceDataProviderTest.php @@ -14,14 +14,8 @@ namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Paginator; use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\SubresourceDataProvider; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; @@ -29,8 +23,14 @@ use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\State\Pagination\Pagination; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompositeRelation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyCar; diff --git a/tests/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProviderTest.php b/tests/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProviderTest.php index 2aaf1561d7f..a37c4a5e472 100644 --- a/tests/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProviderTest.php +++ b/tests/Core/Bridge/NelmioApiDoc/Extractor/AnnotationsProvider/ApiPlatformProviderTest.php @@ -18,12 +18,12 @@ use ApiPlatform\Core\Bridge\NelmioApiDoc\Extractor\AnnotationsProvider\ApiPlatformProvider; use ApiPlatform\Core\Bridge\NelmioApiDoc\Parser\ApiPlatformParser; use ApiPlatform\Core\Bridge\Symfony\Routing\OperationMethodResolverInterface; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\Documentation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; use Nelmio\ApiDocBundle\Annotation\ApiDoc; diff --git a/tests/Core/Bridge/Rector/Rules/ApiResourceAnnotationToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc b/tests/Core/Bridge/Rector/Rules/ApiResourceAnnotationToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc index aa39f81e82d..3bbcf876259 100644 --- a/tests/Core/Bridge/Rector/Rules/ApiResourceAnnotationToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc +++ b/tests/Core/Bridge/Rector/Rules/ApiResourceAnnotationToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc @@ -2,7 +2,7 @@ namespace ApiPlatform\Tests\Bridge\Rector\Rules\ApiResourceAnnotationToApiResourceAttributeRector\Fixture; -use ApiPlatform\Core\Action\NotFoundAction; +use ApiPlatform\Action\NotFoundAction; use ApiPlatform\Core\Annotation\ApiResource; /** @@ -31,7 +31,7 @@ namespace ApiPlatform\Tests\Bridge\Rector\Rules\ApiResourceAnnotationToApiResour use ApiPlatform\Metadata\Get; use ApiPlatform\Metadata\GetCollection; -use ApiPlatform\Core\Action\NotFoundAction; +use ApiPlatform\Action\NotFoundAction; use ApiPlatform\Metadata\ApiResource; #[ApiResource] diff --git a/tests/Core/Bridge/Rector/Rules/LegacyApiResourceAttributeToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc b/tests/Core/Bridge/Rector/Rules/LegacyApiResourceAttributeToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc index 9bd344def45..804582ab322 100644 --- a/tests/Core/Bridge/Rector/Rules/LegacyApiResourceAttributeToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc +++ b/tests/Core/Bridge/Rector/Rules/LegacyApiResourceAttributeToApiResourceAttributeRector/Fixture/disable_item_operation.php.inc @@ -2,7 +2,7 @@ namespace ApiPlatform\Tests\Bridge\Rector\Rules\LegacyApiResourceAttributeToApiResourceAttributeRector\Fixture; -use ApiPlatform\Core\Action\NotFoundAction; +use ApiPlatform\Action\NotFoundAction; use ApiPlatform\Core\Annotation\ApiResource; #[ApiResource(collectionOperations: ['get'], itemOperations: ['get' => ['controller' => NotFoundAction::class, 'read' => false, 'output' => false]])] @@ -18,7 +18,7 @@ namespace ApiPlatform\Tests\Bridge\Rector\Rules\LegacyApiResourceAttributeToApiR use ApiPlatform\Metadata\Get; use ApiPlatform\Metadata\GetCollection; -use ApiPlatform\Core\Action\NotFoundAction; +use ApiPlatform\Action\NotFoundAction; use ApiPlatform\Metadata\ApiResource; #[ApiResource] diff --git a/tests/Core/Bridge/Symfony/Bundle/Command/SwaggerCommandUnitTest.php b/tests/Core/Bridge/Symfony/Bundle/Command/SwaggerCommandUnitTest.php index 6259f192a40..d43fdf5ce96 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Command/SwaggerCommandUnitTest.php +++ b/tests/Core/Bridge/Symfony/Bundle/Command/SwaggerCommandUnitTest.php @@ -14,9 +14,9 @@ namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Command; use ApiPlatform\Core\Bridge\Symfony\Bundle\Command\SwaggerCommand; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; +use ApiPlatform\Documentation\Documentation; use PHPUnit\Framework\MockObject\MockObject; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Console\Input\ArrayInput; diff --git a/tests/Core/Bridge/Symfony/Messenger/DataPersisterTest.php b/tests/Core/Bridge/Symfony/Messenger/DataPersisterTest.php index 259f8a42814..983fa78db75 100644 --- a/tests/Core/Bridge/Symfony/Messenger/DataPersisterTest.php +++ b/tests/Core/Bridge/Symfony/Messenger/DataPersisterTest.php @@ -13,13 +13,13 @@ namespace ApiPlatform\Core\Tests\Bridge\Symfony\Messenger; -use ApiPlatform\Core\Bridge\Symfony\Messenger\ContextStamp; use ApiPlatform\Core\Bridge\Symfony\Messenger\DataPersister; -use ApiPlatform\Core\Bridge\Symfony\Messenger\RemoveStamp; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\ResourceClassNotFoundException; +use ApiPlatform\Symfony\Messenger\ContextStamp; +use ApiPlatform\Symfony\Messenger\RemoveStamp; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyCar; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Symfony/Routing/ApiLoaderTest.php b/tests/Core/Bridge/Symfony/Routing/ApiLoaderTest.php index 5498f61756a..f99ef12860e 100644 --- a/tests/Core/Bridge/Symfony/Routing/ApiLoaderTest.php +++ b/tests/Core/Bridge/Symfony/Routing/ApiLoaderTest.php @@ -14,7 +14,6 @@ namespace ApiPlatform\Core\Tests\Bridge\Symfony\Routing; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; -use ApiPlatform\Core\Bridge\Symfony\Routing\ApiLoader; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; @@ -26,10 +25,11 @@ use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactory; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolver; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\InvalidResourceException; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; +use ApiPlatform\Symfony\Routing\ApiLoader; use ApiPlatform\Tests\Fixtures\DummyEntity; use ApiPlatform\Tests\Fixtures\RelatedDummyEntity; use PHPUnit\Framework\TestCase; @@ -236,7 +236,7 @@ public function testRecursiveSubresource() private function getApiLoaderWithResourceMetadata(ResourceMetadata $resourceMetadata, $recursiveSubresource = false): ApiLoader { - $routingConfig = __DIR__.'/../../../../../src/Core/Bridge/Symfony/Bundle/Resources/config/routing'; + $routingConfig = __DIR__.'/../../../../../src/Symfony/Bundle/Resources/config/routing'; $kernelProphecy = $this->prophesize(KernelInterface::class); $kernelProphecy->locateResource(Argument::any())->willReturn($routingConfig); diff --git a/tests/Core/Bridge/Symfony/Routing/RouterOperationPathResolverTest.php b/tests/Core/Bridge/Symfony/Routing/RouterOperationPathResolverTest.php index bb0ad7d44cd..c8c72e99afc 100644 --- a/tests/Core/Bridge/Symfony/Routing/RouterOperationPathResolverTest.php +++ b/tests/Core/Bridge/Symfony/Routing/RouterOperationPathResolverTest.php @@ -16,9 +16,9 @@ use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Bridge\Symfony\Routing\RouteNameGenerator; use ApiPlatform\Core\Bridge\Symfony\Routing\RouterOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\PathResolver\OperationPathResolverInterface; use PHPUnit\Framework\TestCase; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; diff --git a/tests/Core/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php b/tests/Core/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php index 6286f1ba2ff..d5523db2ae9 100644 --- a/tests/Core/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php +++ b/tests/Core/Bridge/Symfony/Validator/EventListener/ValidateListenerTest.php @@ -14,10 +14,10 @@ namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\EventListener; use ApiPlatform\Core\Bridge\Symfony\Validator\EventListener\ValidateListener; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; use ApiPlatform\Tests\Fixtures\DummyEntity; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/OpenApi/Factory/OpenApiFactoryTest.php b/tests/Core/OpenApi/Factory/OpenApiFactoryTest.php index 769eba30623..88b5b6d9233 100644 --- a/tests/Core/OpenApi/Factory/OpenApiFactoryTest.php +++ b/tests/Core/OpenApi/Factory/OpenApiFactoryTest.php @@ -15,10 +15,6 @@ use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Bridge\Symfony\Routing\RouterOperationPathResolver; -use ApiPlatform\Core\DataProvider\PaginationOptions; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonSchema\TypeFactory; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; @@ -29,16 +25,20 @@ use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\OpenApi\Factory\OpenApiFactory; -use ApiPlatform\Core\OpenApi\Model; -use ApiPlatform\Core\OpenApi\OpenApi; -use ApiPlatform\Core\OpenApi\Options; -use ApiPlatform\Core\OpenApi\Serializer\OpenApiNormalizer; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactory; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolver; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactory; +use ApiPlatform\JsonSchema\TypeFactory; +use ApiPlatform\OpenApi\Model; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\OpenApi\Options; +use ApiPlatform\OpenApi\Serializer\OpenApiNormalizer; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; +use ApiPlatform\State\Pagination\PaginationOptions; use ApiPlatform\Tests\Fixtures\DummyFilter; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Answer; diff --git a/tests/Core/Swagger/Serializer/DocumentationNormalizerV2Test.php b/tests/Core/Swagger/Serializer/DocumentationNormalizerV2Test.php index 457922e680f..5ec439c5af6 100644 --- a/tests/Core/Swagger/Serializer/DocumentationNormalizerV2Test.php +++ b/tests/Core/Swagger/Serializer/DocumentationNormalizerV2Test.php @@ -21,9 +21,6 @@ use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; use ApiPlatform\Core\Bridge\Symfony\Routing\RouterOperationPathResolver; -use ApiPlatform\Core\Documentation\Documentation; -use ApiPlatform\Core\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonSchema\TypeFactory; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; @@ -34,12 +31,15 @@ use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactory; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\Documentation; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\JsonSchema\SchemaFactory; +use ApiPlatform\JsonSchema\TypeFactory; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolverInterface; use ApiPlatform\Tests\Fixtures\DummyFilter; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\InputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; diff --git a/tests/Core/Swagger/Serializer/DocumentationNormalizerV3Test.php b/tests/Core/Swagger/Serializer/DocumentationNormalizerV3Test.php index 472a0867e06..db50d7046dd 100644 --- a/tests/Core/Swagger/Serializer/DocumentationNormalizerV3Test.php +++ b/tests/Core/Swagger/Serializer/DocumentationNormalizerV3Test.php @@ -20,11 +20,6 @@ use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Bridge\Symfony\Routing\RouterOperationPathResolver; -use ApiPlatform\Core\Documentation\Documentation; -use ApiPlatform\Core\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; -use ApiPlatform\Core\JsonSchema\TypeFactory; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; @@ -33,16 +28,21 @@ use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; -use ApiPlatform\Core\OpenApi\Model; -use ApiPlatform\Core\OpenApi\OpenApi; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactory; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\Documentation; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\JsonSchema\SchemaFactory; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\TypeFactory; +use ApiPlatform\JsonSchema\TypeFactoryInterface; +use ApiPlatform\OpenApi\Model; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolverInterface; use ApiPlatform\Tests\Fixtures\DummyFilter; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Answer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/Util/RequestAttributesExtractorTest.php b/tests/Core/Util/RequestAttributesExtractorTest.php deleted file mode 100644 index ed0b52705ec..00000000000 --- a/tests/Core/Util/RequestAttributesExtractorTest.php +++ /dev/null @@ -1,252 +0,0 @@ - - * - * 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\Core\Tests\Util; - -use ApiPlatform\Core\Util\RequestAttributesExtractor; -use PHPUnit\Framework\TestCase; -use Symfony\Component\HttpFoundation\Request; - -/** - * @author Kévin Dunglas - */ -class RequestAttributesExtractorTest extends TestCase -{ - public function testExtractCollectionAttributes() - { - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_collection_operation_name' => 'post']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'collection_operation_name' => 'post', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - } - - public function testExtractItemAttributes() - { - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - } - - public function testExtractReceive() - { - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_receive' => '0']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => false, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_receive' => '1']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - } - - public function testExtractRespond() - { - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_respond' => '0']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => false, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_respond' => '1']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - } - - public function testExtractPersist() - { - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_persist' => '0']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => false, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_persist' => '1']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - } - - public function testResourceClassNotSet() - { - $this->assertEmpty(RequestAttributesExtractor::extractAttributes(new Request([], [], ['_api_item_operation_name' => 'get']))); - } - - public function testOperationNotSet() - { - $this->assertEmpty(RequestAttributesExtractor::extractAttributes(new Request([], [], ['_api_resource_class' => 'Foo']))); - } - - public function testExtractPreviousDataAttributes() - { - $object = new \stdClass(); - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', 'previous_data' => $object]); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'previous_data' => $object, - 'identifiers' => ['id' => ['Foo', 'id']], - 'has_composite_identifier' => false, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - } - - public function testExtractIdentifiers() - { - $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_identifiers' => ['test'], '_api_has_composite_identifier' => true]); - - $this->assertEquals( - [ - 'resource_class' => 'Foo', - 'item_operation_name' => 'get', - 'receive' => true, - 'respond' => true, - 'persist' => true, - 'identifiers' => ['test' => ['Foo', 'test']], - 'has_composite_identifier' => true, - ], - RequestAttributesExtractor::extractAttributes($request) - ); - } -} diff --git a/tests/Core/Validator/EventListener/ValidateListenerTest.php b/tests/Core/Validator/EventListener/ValidateListenerTest.php index 7add8bf9190..66b4c84b4f1 100644 --- a/tests/Core/Validator/EventListener/ValidateListenerTest.php +++ b/tests/Core/Validator/EventListener/ValidateListenerTest.php @@ -16,9 +16,9 @@ use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; -use ApiPlatform\Core\Validator\EventListener\ValidateListener; -use ApiPlatform\Core\Validator\Exception\ValidationException; -use ApiPlatform\Core\Validator\ValidatorInterface; +use ApiPlatform\Symfony\EventListener\Exception\ValidationException; +use ApiPlatform\Symfony\EventListener\ValidateListener; +use ApiPlatform\Symfony\EventListener\ValidatorInterface; use ApiPlatform\Tests\Fixtures\DummyEntity; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/Bridge/Doctrine/Common/Filter/BooleanFilterTestTrait.php b/tests/Doctrine/Common/Filter/BooleanFilterTestTrait.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Common/Filter/BooleanFilterTestTrait.php rename to tests/Doctrine/Common/Filter/BooleanFilterTestTrait.php index 3745fd2b02a..3f24d39324b 100644 --- a/tests/Core/Bridge/Doctrine/Common/Filter/BooleanFilterTestTrait.php +++ b/tests/Doctrine/Common/Filter/BooleanFilterTestTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Tests\Doctrine\Common\Filter; /** * @author Amrouche Hamza diff --git a/tests/Core/Bridge/Doctrine/Common/Filter/DateFilterTestTrait.php b/tests/Doctrine/Common/Filter/DateFilterTestTrait.php similarity index 99% rename from tests/Core/Bridge/Doctrine/Common/Filter/DateFilterTestTrait.php rename to tests/Doctrine/Common/Filter/DateFilterTestTrait.php index 7d680d26d54..bb90d785060 100644 --- a/tests/Core/Bridge/Doctrine/Common/Filter/DateFilterTestTrait.php +++ b/tests/Doctrine/Common/Filter/DateFilterTestTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Tests\Doctrine\Common\Filter; /** * @author Théo FIDRY diff --git a/tests/Core/Bridge/Doctrine/Common/Filter/ExistsFilterTestTrait.php b/tests/Doctrine/Common/Filter/ExistsFilterTestTrait.php similarity index 99% rename from tests/Core/Bridge/Doctrine/Common/Filter/ExistsFilterTestTrait.php rename to tests/Doctrine/Common/Filter/ExistsFilterTestTrait.php index 4a236cba5d8..6e5199af85f 100644 --- a/tests/Core/Bridge/Doctrine/Common/Filter/ExistsFilterTestTrait.php +++ b/tests/Doctrine/Common/Filter/ExistsFilterTestTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Tests\Doctrine\Common\Filter; /** * @author Antoine Bluchet diff --git a/tests/Core/Bridge/Doctrine/Common/Filter/NumericFilterTestTrait.php b/tests/Doctrine/Common/Filter/NumericFilterTestTrait.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Common/Filter/NumericFilterTestTrait.php rename to tests/Doctrine/Common/Filter/NumericFilterTestTrait.php index 7442b469a64..288ba253c6a 100644 --- a/tests/Core/Bridge/Doctrine/Common/Filter/NumericFilterTestTrait.php +++ b/tests/Doctrine/Common/Filter/NumericFilterTestTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Tests\Doctrine\Common\Filter; /** * @author Amrouche Hamza diff --git a/tests/Core/Bridge/Doctrine/Common/Filter/OrderFilterTestTrait.php b/tests/Doctrine/Common/Filter/OrderFilterTestTrait.php similarity index 99% rename from tests/Core/Bridge/Doctrine/Common/Filter/OrderFilterTestTrait.php rename to tests/Doctrine/Common/Filter/OrderFilterTestTrait.php index b515ed70cd0..78db64bbfd8 100644 --- a/tests/Core/Bridge/Doctrine/Common/Filter/OrderFilterTestTrait.php +++ b/tests/Doctrine/Common/Filter/OrderFilterTestTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Tests\Doctrine\Common\Filter; /** * @author Théo FIDRY diff --git a/tests/Core/Bridge/Doctrine/Common/Filter/RangeFilterTestTrait.php b/tests/Doctrine/Common/Filter/RangeFilterTestTrait.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Common/Filter/RangeFilterTestTrait.php rename to tests/Doctrine/Common/Filter/RangeFilterTestTrait.php index 73bab437ff9..3940b4cabe7 100644 --- a/tests/Core/Bridge/Doctrine/Common/Filter/RangeFilterTestTrait.php +++ b/tests/Doctrine/Common/Filter/RangeFilterTestTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Tests\Doctrine\Common\Filter; /** * @author Lee Siong Chan diff --git a/tests/Core/Bridge/Doctrine/Common/Filter/SearchFilterTestTrait.php b/tests/Doctrine/Common/Filter/SearchFilterTestTrait.php similarity index 99% rename from tests/Core/Bridge/Doctrine/Common/Filter/SearchFilterTestTrait.php rename to tests/Doctrine/Common/Filter/SearchFilterTestTrait.php index 6ef486a79ad..38b77a6a251 100644 --- a/tests/Core/Bridge/Doctrine/Common/Filter/SearchFilterTestTrait.php +++ b/tests/Doctrine/Common/Filter/SearchFilterTestTrait.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter; +namespace ApiPlatform\Tests\Doctrine\Common\Filter; /** * @author Julien Deniau diff --git a/tests/Core/Bridge/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php b/tests/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php similarity index 99% rename from tests/Core/Bridge/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php rename to tests/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php index d5360b2eca0..bae1c0c09d4 100644 --- a/tests/Core/Bridge/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php +++ b/tests/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\EventListener; +namespace ApiPlatform\Tests\Doctrine\EventListener; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface as ApiUrlGeneratorInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Bridge\Doctrine\EventListener\PublishMercureUpdatesListener; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\EventListener\PublishMercureUpdatesListener; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\GraphQl\Subscription\MercureSubscriptionIriGeneratorInterface as GraphQlMercureSubscriptionIriGeneratorInterface; use ApiPlatform\GraphQl\Subscription\SubscriptionManagerInterface as GraphQlSubscriptionManagerInterface; diff --git a/tests/Core/Bridge/Doctrine/EventListener/PurgeHttpCacheListenerTest.php b/tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php similarity index 97% rename from tests/Core/Bridge/Doctrine/EventListener/PurgeHttpCacheListenerTest.php rename to tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php index 66133672b2b..de8227100da 100644 --- a/tests/Core/Bridge/Doctrine/EventListener/PurgeHttpCacheListenerTest.php +++ b/tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\EventListener; +namespace ApiPlatform\Tests\Doctrine\EventListener; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Bridge\Doctrine\EventListener\PurgeHttpCacheListener; -use ApiPlatform\Core\HttpCache\PurgerInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\EventListener\PurgeHttpCacheListener; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\HttpCache\PurgerInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyNoGetOperation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; diff --git a/tests/Core/Bridge/Doctrine/EventListener/WriteListenerTest.php b/tests/Doctrine/EventListener/WriteListenerTest.php similarity index 80% rename from tests/Core/Bridge/Doctrine/EventListener/WriteListenerTest.php rename to tests/Doctrine/EventListener/WriteListenerTest.php index 836c6f788d7..9e851c1cc39 100644 --- a/tests/Core/Bridge/Doctrine/EventListener/WriteListenerTest.php +++ b/tests/Doctrine/EventListener/WriteListenerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\EventListener; +namespace ApiPlatform\Tests\Doctrine\EventListener; -use ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\EventListener\WriteListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use Doctrine\Persistence\ManagerRegistry; use Doctrine\Persistence\ObjectManager; @@ -31,7 +31,7 @@ class WriteListenerTest extends TestCase use ProphecyTrait; /** - * @expectedDeprecation The ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. + * @expectedDeprecation The ApiPlatform\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. */ public function testOnKernelViewWithControllerResultAndPostMethod() { @@ -55,7 +55,7 @@ public function testOnKernelViewWithControllerResultAndPostMethod() } /** - * @expectedDeprecation The ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. + * @expectedDeprecation The ApiPlatform\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. */ public function testOnKernelViewWithControllerResultAndDeleteMethod() { @@ -78,7 +78,7 @@ public function testOnKernelViewWithControllerResultAndDeleteMethod() } /** - * @expectedDeprecation The ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. + * @expectedDeprecation The ApiPlatform\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. */ public function testOnKernelViewWithSafeMethod() { @@ -101,7 +101,7 @@ public function testOnKernelViewWithSafeMethod() } /** - * @expectedDeprecation The ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. + * @expectedDeprecation The ApiPlatform\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. */ public function testOnKernelViewWithNoResourceClass() { @@ -123,7 +123,7 @@ public function testOnKernelViewWithNoResourceClass() } /** - * @expectedDeprecation The ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. + * @expectedDeprecation The ApiPlatform\Doctrine\EventListener\WriteListener class is deprecated since version 2.2 and will be removed in 3.0. Use the ApiPlatform\Core\EventListener\WriteListener class instead. * @doesNotPerformAssertions */ public function testOnKernelViewWithNoManager() diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtensionTest.php b/tests/Doctrine/Odm/Extension/FilterExtensionTest.php similarity index 93% rename from tests/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtensionTest.php rename to tests/Doctrine/Odm/Extension/FilterExtensionTest.php index 3bb7c7756ad..0fbd27c3ff2 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtensionTest.php +++ b/tests/Doctrine/Odm/Extension/FilterExtensionTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Tests\Doctrine\Odm\Extension; use ApiPlatform\Core\Api\FilterInterface as ApiFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\FilterExtension; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\FilterInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\FilterExtension; +use ApiPlatform\Doctrine\Odm\Filter\FilterInterface; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GetCollection; use ApiPlatform\Metadata\Operations; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtensionTest.php b/tests/Doctrine/Odm/Extension/OrderExtensionTest.php similarity index 98% rename from tests/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtensionTest.php rename to tests/Doctrine/Odm/Extension/OrderExtensionTest.php index 0e08d444138..7b9b1532e68 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtensionTest.php +++ b/tests/Doctrine/Odm/Extension/OrderExtensionTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Extension; +namespace ApiPlatform\Tests\Doctrine\Odm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\OrderExtension; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\OrderExtension; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GetCollection; use ApiPlatform\Metadata\Operations; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtensionTest.php b/tests/Doctrine/Odm/Extension/PaginationExtensionTest.php similarity index 98% rename from tests/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtensionTest.php rename to tests/Doctrine/Odm/Extension/PaginationExtensionTest.php index f3cbabf3228..9729f1d6a52 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtensionTest.php +++ b/tests/Doctrine/Odm/Extension/PaginationExtensionTest.php @@ -11,21 +11,21 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Extension; - -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\PaginationExtension; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Paginator; -use ApiPlatform\Core\DataProvider\Pagination; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmSetup; +namespace ApiPlatform\Tests\Doctrine\Odm\Extension; + use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\PaginationExtension; +use ApiPlatform\Doctrine\Odm\Paginator; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GetCollection; use ApiPlatform\Metadata\Operations; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\State\Pagination\Pagination; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; +use ApiPlatform\Test\DoctrineMongoDbOdmSetup; use ApiPlatform\Tests\Fixtures\TestBundle\Document\Dummy; use Doctrine\ODM\MongoDB\Aggregation\Builder; use Doctrine\ODM\MongoDB\Aggregation\Stage\Count; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilterTest.php b/tests/Doctrine/Odm/Filter/BooleanFilterTest.php similarity index 91% rename from tests/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilterTest.php rename to tests/Doctrine/Odm/Filter/BooleanFilterTest.php index d9fb4c75df6..a248f36af48 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilterTest.php +++ b/tests/Doctrine/Odm/Filter/BooleanFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Tests\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\BooleanFilter; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\BooleanFilterTestTrait; +use ApiPlatform\Doctrine\Odm\Filter\BooleanFilter; +use ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\BooleanFilterTestTrait; /** * @group mongodb diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/DateFilterTest.php b/tests/Doctrine/Odm/Filter/DateFilterTest.php similarity index 97% rename from tests/Bridge/Doctrine/MongoDbOdm/Filter/DateFilterTest.php rename to tests/Doctrine/Odm/Filter/DateFilterTest.php index 45105ea2458..28b8ee32f58 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Filter/DateFilterTest.php +++ b/tests/Doctrine/Odm/Filter/DateFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Tests\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\DateFilter; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\DateFilterTestTrait; +use ApiPlatform\Doctrine\Odm\Filter\DateFilter; +use ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\DateFilterTestTrait; use MongoDB\BSON\UTCDateTime; /** diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilterTest.php b/tests/Doctrine/Odm/Filter/ExistsFilterTest.php similarity index 98% rename from tests/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilterTest.php rename to tests/Doctrine/Odm/Filter/ExistsFilterTest.php index afbc8f29c2e..3cb20b81825 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilterTest.php +++ b/tests/Doctrine/Odm/Filter/ExistsFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Tests\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\ExistsFilter; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\ExistsFilterTestTrait; +use ApiPlatform\Doctrine\Odm\Filter\ExistsFilter; +use ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\ExistsFilterTestTrait; use Doctrine\Persistence\ManagerRegistry; /** diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilterTest.php b/tests/Doctrine/Odm/Filter/NumericFilterTest.php similarity index 95% rename from tests/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilterTest.php rename to tests/Doctrine/Odm/Filter/NumericFilterTest.php index f606bf9240c..7f837f4eefe 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilterTest.php +++ b/tests/Doctrine/Odm/Filter/NumericFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Tests\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\NumericFilter; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\NumericFilterTestTrait; +use ApiPlatform\Doctrine\Odm\Filter\NumericFilter; +use ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\NumericFilterTestTrait; /** * @group mongodb diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilterTest.php b/tests/Doctrine/Odm/Filter/OrderFilterTest.php similarity index 98% rename from tests/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilterTest.php rename to tests/Doctrine/Odm/Filter/OrderFilterTest.php index 88816707e77..fb8eb884b05 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilterTest.php +++ b/tests/Doctrine/Odm/Filter/OrderFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Tests\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\OrderFilter; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\OrderFilterTestTrait; +use ApiPlatform\Doctrine\Odm\Filter\OrderFilter; +use ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\OrderFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Document\EmbeddedDummy; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; use Doctrine\Persistence\ManagerRegistry; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilterTest.php b/tests/Doctrine/Odm/Filter/RangeFilterTest.php similarity index 98% rename from tests/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilterTest.php rename to tests/Doctrine/Odm/Filter/RangeFilterTest.php index 31fb18bf5ce..457edbc631a 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilterTest.php +++ b/tests/Doctrine/Odm/Filter/RangeFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Tests\Doctrine\Odm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\RangeFilter; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\RangeFilterTestTrait; +use ApiPlatform\Doctrine\Odm\Filter\RangeFilter; +use ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\RangeFilterTestTrait; /** * @group mongodb diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php b/tests/Doctrine/Odm/Filter/SearchFilterTest.php similarity index 99% rename from tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php rename to tests/Doctrine/Odm/Filter/SearchFilterTest.php index f1db5e96132..eb77aaf3000 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php +++ b/tests/Doctrine/Odm/Filter/SearchFilterTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Filter; +namespace ApiPlatform\Tests\Doctrine\Odm\Filter; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; use ApiPlatform\Core\Api\IriConverterInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\SearchFilterTestTrait; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Filter\SearchFilter; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Test\DoctrineMongoDbOdmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\SearchFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Document\RelatedDummy; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; use Doctrine\Persistence\ManagerRegistry; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php b/tests/Doctrine/Odm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php similarity index 96% rename from tests/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php rename to tests/Doctrine/Odm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php index caa0d04a4c7..4561369c24a 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php +++ b/tests/Doctrine/Odm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm\Metadata\Property; +namespace ApiPlatform\Tests\Doctrine\Odm\Metadata\Property; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Document\Dummy; use Doctrine\ODM\MongoDB\DocumentManager; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PaginatorTest.php b/tests/Doctrine/Odm/PaginatorTest.php similarity index 97% rename from tests/Bridge/Doctrine/MongoDbOdm/PaginatorTest.php rename to tests/Doctrine/Odm/PaginatorTest.php index c22d0195929..f12f71b9eb0 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PaginatorTest.php +++ b/tests/Doctrine/Odm/PaginatorTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\MongoDbOdm; +namespace ApiPlatform\Tests\Doctrine\Odm; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Paginator; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmSetup; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Paginator; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Test\DoctrineMongoDbOdmSetup; use ApiPlatform\Tests\Fixtures\TestBundle\Document\Dummy; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Iterator\Iterator; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractorTest.php b/tests/Doctrine/Odm/PropertyInfo/DoctrineExtractorTest.php similarity index 89% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractorTest.php rename to tests/Doctrine/Odm/PropertyInfo/DoctrineExtractorTest.php index 93f54cd086f..288dc0eb5c4 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractorTest.php +++ b/tests/Doctrine/Odm/PropertyInfo/DoctrineExtractorTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo; - -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\PropertyInfo\DoctrineExtractor; -use ApiPlatform\Core\Test\DoctrineMongoDbOdmSetup; -use ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures\DoctrineDummy; -use ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures\DoctrineEmbeddable; -use ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures\DoctrineFooType; -use ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures\DoctrineGeneratedValue; -use ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures\DoctrineRelation; -use ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures\DoctrineWithEmbedded; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo; + +use ApiPlatform\Doctrine\Odm\PropertyInfo\DoctrineExtractor; +use ApiPlatform\Test\DoctrineMongoDbOdmSetup; +use ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures\DoctrineDummy; +use ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures\DoctrineEmbeddable; +use ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures\DoctrineFooType; +use ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures\DoctrineGeneratedValue; +use ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures\DoctrineRelation; +use ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures\DoctrineWithEmbedded; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Types\Type as MongoDbType; @@ -212,7 +212,7 @@ public function testGetTypesWithEmbedManyOmittingTargetDocument(): void private function createExtractor(): DoctrineExtractor { - $config = DoctrineMongoDbOdmSetup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true); + $config = DoctrineMongoDbOdmSetup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR], true); $documentManager = DocumentManager::create(null, $config); if (!MongoDbType::hasType('custom_foo')) { diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineDummy.php b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineDummy.php similarity index 96% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineDummy.php rename to tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineDummy.php index b11f76ebc53..524a0a07361 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineDummy.php +++ b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineDummy.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures; use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineEmbeddable.php b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineEmbeddable.php similarity index 87% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineEmbeddable.php rename to tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineEmbeddable.php index 00e19cf3521..66bd98c5c8a 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineEmbeddable.php +++ b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineEmbeddable.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures; use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument; use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineFooType.php b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineFooType.php similarity index 93% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineFooType.php rename to tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineFooType.php index a57eae39645..dde54ce5103 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineFooType.php +++ b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineFooType.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures; use Doctrine\ODM\MongoDB\Types\Type; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineGeneratedValue.php b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineGeneratedValue.php similarity index 89% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineGeneratedValue.php rename to tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineGeneratedValue.php index 8e7dce891f7..2eee7ac2fa9 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineGeneratedValue.php +++ b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineGeneratedValue.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures; use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineRelation.php b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineRelation.php similarity index 89% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineRelation.php rename to tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineRelation.php index 4c2c9a82cef..bdd4ac673b3 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineRelation.php +++ b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineRelation.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures; use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineWithEmbedded.php b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineWithEmbedded.php similarity index 92% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineWithEmbedded.php rename to tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineWithEmbedded.php index 8061362d5f4..b2a32f5c6ed 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/DoctrineWithEmbedded.php +++ b/tests/Doctrine/Odm/PropertyInfo/Fixtures/DoctrineWithEmbedded.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures; use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/Foo.php b/tests/Doctrine/Odm/PropertyInfo/Fixtures/Foo.php similarity index 83% rename from tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/Foo.php rename to tests/Doctrine/Odm/PropertyInfo/Fixtures/Foo.php index 8350a4e5f52..1a5b7d87fda 100644 --- a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/Fixtures/Foo.php +++ b/tests/Doctrine/Odm/PropertyInfo/Fixtures/Foo.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\MongoDbOdm\PropertyInfo\Fixtures; +namespace ApiPlatform\Tests\Doctrine\Odm\PropertyInfo\Fixtures; /** * @author Teoh Han Hui diff --git a/tests/Bridge/Doctrine/Odm/State/CollectionProviderTest.php b/tests/Doctrine/Odm/State/CollectionProviderTest.php similarity index 97% rename from tests/Bridge/Doctrine/Odm/State/CollectionProviderTest.php rename to tests/Doctrine/Odm/State/CollectionProviderTest.php index 1d908c333fa..7a39d1af6ac 100644 --- a/tests/Bridge/Doctrine/Odm/State/CollectionProviderTest.php +++ b/tests/Doctrine/Odm/State/CollectionProviderTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\Odm\State; +namespace ApiPlatform\Tests\Doctrine\Odm\State; -use ApiPlatform\Bridge\Doctrine\Odm\State\CollectionProvider; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultCollectionExtensionInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\State\CollectionProvider; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Get; diff --git a/tests/Bridge/Doctrine/Odm/State/ItemProviderTest.php b/tests/Doctrine/Odm/State/ItemProviderTest.php similarity index 97% rename from tests/Bridge/Doctrine/Odm/State/ItemProviderTest.php rename to tests/Doctrine/Odm/State/ItemProviderTest.php index 18721c0bb14..c28879e17ff 100644 --- a/tests/Bridge/Doctrine/Odm/State/ItemProviderTest.php +++ b/tests/Doctrine/Odm/State/ItemProviderTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\Odm\State; +namespace ApiPlatform\Tests\Doctrine\Odm\State; -use ApiPlatform\Bridge\Doctrine\Odm\State\ItemProvider; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationResultItemExtensionInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationResultItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\State\ItemProvider; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Get; diff --git a/tests/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php b/tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php similarity index 99% rename from tests/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php rename to tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php index 4326c63ab34..5713ab66ab5 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php +++ b/tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php @@ -11,22 +11,22 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Tests\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\EagerLoadingExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\EagerLoadingExtension; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\PropertyNotFoundException; use ApiPlatform\Exception\ResourceClassNotFoundException; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\AbstractDummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\ConcreteDummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php b/tests/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php similarity index 99% rename from tests/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php rename to tests/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php index 88210577c11..57f4a1eef20 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php +++ b/tests/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Tests\Doctrine\Orm\Extension; use ApiPlatform\Core\Api\ResourceClassResolver; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\FilterEagerLoadingExtension; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompositeItem; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompositeLabel; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompositeRelation; diff --git a/tests/Core/Bridge/Doctrine/Orm/Extension/FilterExtensionTest.php b/tests/Doctrine/Orm/Extension/FilterExtensionTest.php similarity index 95% rename from tests/Core/Bridge/Doctrine/Orm/Extension/FilterExtensionTest.php rename to tests/Doctrine/Orm/Extension/FilterExtensionTest.php index 7d030265282..64fccc77ec1 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Extension/FilterExtensionTest.php +++ b/tests/Doctrine/Orm/Extension/FilterExtensionTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Tests\Doctrine\Orm\Extension; use ApiPlatform\Core\Api\FilterCollection; use ApiPlatform\Core\Api\FilterInterface as ApiFilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\FilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\FilterExtension; +use ApiPlatform\Doctrine\Orm\Filter\FilterInterface; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use Doctrine\ORM\QueryBuilder; diff --git a/tests/Core/Bridge/Doctrine/Orm/Extension/OrderExtensionTest.php b/tests/Doctrine/Orm/Extension/OrderExtensionTest.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Orm/Extension/OrderExtensionTest.php rename to tests/Doctrine/Orm/Extension/OrderExtensionTest.php index 96a171f624c..db811c33a5d 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Extension/OrderExtensionTest.php +++ b/tests/Doctrine/Orm/Extension/OrderExtensionTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Extension; +namespace ApiPlatform\Tests\Doctrine\Orm\Extension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\OrderExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\OrderExtension; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\EmbeddedDummy; use Doctrine\ORM\EntityManager; diff --git a/tests/Core/Bridge/Doctrine/Orm/Extension/PaginationExtensionTest.php b/tests/Doctrine/Orm/Extension/PaginationExtensionTest.php similarity index 84% rename from tests/Core/Bridge/Doctrine/Orm/Extension/PaginationExtensionTest.php rename to tests/Doctrine/Orm/Extension/PaginationExtensionTest.php index 9f293fbd1cd..d418ae35484 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Extension/PaginationExtensionTest.php +++ b/tests/Doctrine/Orm/Extension/PaginationExtensionTest.php @@ -11,19 +11,19 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Extension; - -use ApiPlatform\Core\Bridge\Doctrine\Orm\AbstractPaginator; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\ContextAwareQueryResultCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; -use ApiPlatform\Core\DataProvider\Pagination; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; +namespace ApiPlatform\Tests\Doctrine\Orm\Extension; + use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\AbstractPaginator; +use ApiPlatform\Doctrine\Orm\Extension\ContextAwareQueryResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\PaginationExtension; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\State\Pagination\Pagination; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManagerInterface; @@ -48,9 +48,9 @@ class PaginationExtensionTest extends TestCase /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyConstruct() { @@ -68,9 +68,9 @@ public function testLegacyConstruct() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyConstructWithBadArgument() { @@ -150,9 +150,9 @@ public function testApplyToCollection() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyApplyToCollection() { @@ -217,9 +217,9 @@ public function testApplyToCollectionWithItemPerPageZero() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyApplyToCollectionWithItemPerPageZero() { @@ -287,9 +287,9 @@ public function testApplyToCollectionWithItemPerPageZeroAndPage2() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyApplyToCollectionWithItemPerPageZeroAndPage2() { @@ -360,9 +360,9 @@ public function testApplyToCollectionWithItemPerPageLessThan0() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyApplyToCollectionWithItemPerPageLessThen0() { @@ -430,9 +430,9 @@ public function testApplyToCollectionWithItemPerPageTooHigh() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyApplyToCollectionWithItemPerPageTooHigh() { @@ -497,9 +497,9 @@ public function testApplyToCollectionWithGraphql() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyApplyToCollectionWithGraphql() { @@ -558,8 +558,8 @@ public function testApplyToCollectionNofilters() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacyApplyToCollectionNoRequest() { @@ -578,8 +578,8 @@ public function testLegacyApplyToCollectionNoRequest() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacyApplyToCollectionEmptyRequest() { @@ -628,9 +628,9 @@ public function testApplyToCollectionPaginationDisabled() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacyApplyToCollectionPaginationDisabled() { @@ -710,9 +710,9 @@ public function testApplyToCollectionWithMaximumItemsPerPage() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. * @expectedDeprecation The "maximum_items_per_page" option has been deprecated since API Platform 2.5 in favor of "pagination_maximum_items_per_page" and will be removed in API Platform 3. */ public function testLegacyApplyToCollectionWithMaximumItemsPerPage() @@ -768,8 +768,8 @@ public function testSupportsResult() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacySupportsResult() { @@ -790,8 +790,8 @@ public function testLegacySupportsResult() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacySupportsResultNoRequest() { @@ -805,8 +805,8 @@ public function testLegacySupportsResultNoRequest() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacySupportsResultEmptyRequest() { @@ -846,9 +846,9 @@ public function testSupportsResultClientNotAllowedToPaginate() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacySupportsResultClientNotAllowedToPaginate() { @@ -889,9 +889,9 @@ public function testSupportsResultPaginationDisabled() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. - * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator" as third argument instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. + * @expectedDeprecation Passing "$enabled", "$clientEnabled", "$clientItemsPerPage", "$itemsPerPage", "$pageParameterName", "$enabledParameterName", "$itemsPerPageParameterName", "$maximumItemPerPage", "$partial", "$clientPartial", "$partialParameterName" arguments is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Doctrine\Orm\Paginator" as third argument instead. */ public function testLegacySupportsResultPaginationDisabled() { @@ -1003,8 +1003,8 @@ public function testGetResultWithoutDistinct() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacyGetResult() { @@ -1100,8 +1100,8 @@ public function fetchJoinCollectionProvider(): array /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacyGetResultWithFetchJoinCollectionDisabled() { @@ -1203,8 +1203,8 @@ public function fetchUseOutputWalkersProvider(): array /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacyGetResultWithUseOutputWalkersDisabled() { @@ -1287,8 +1287,8 @@ public function testGetResultWithPartial() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacyGetResultWithPartial() { @@ -1364,8 +1364,8 @@ public function testSimpleGetResult() /** * @group legacy - * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. - * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\DataProvider\Pagination" instead. + * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" as second argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead. + * @expectedDeprecation Passing an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" as third argument of "ApiPlatform\Doctrine\Orm\Extension\PaginationExtension" is deprecated since API Platform 2.4 and will not be possible anymore in API Platform 3. Pass an instance of "ApiPlatform\State\Pagination\Pagination" instead. */ public function testLegacySimpleGetResult() { diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/BooleanFilterTest.php b/tests/Doctrine/Orm/Filter/BooleanFilterTest.php similarity index 90% rename from tests/Core/Bridge/Doctrine/Orm/Filter/BooleanFilterTest.php rename to tests/Doctrine/Orm/Filter/BooleanFilterTest.php index 3730063e42c..60cdace8ddf 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/BooleanFilterTest.php +++ b/tests/Doctrine/Orm/Filter/BooleanFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter; -use ApiPlatform\Core\Test\DoctrineOrmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\BooleanFilterTestTrait; +use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; +use ApiPlatform\Test\DoctrineOrmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\BooleanFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; /** diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/CommonFilterTest.php b/tests/Doctrine/Orm/Filter/CommonFilterTest.php similarity index 94% rename from tests/Core/Bridge/Doctrine/Orm/Filter/CommonFilterTest.php rename to tests/Doctrine/Orm/Filter/CommonFilterTest.php index 603f1a020a0..2cb39aa7185 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/CommonFilterTest.php +++ b/tests/Doctrine/Orm/Filter/CommonFilterTest.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Doctrine\Orm\Filter\DummyFilter; diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/DateFilterTest.php b/tests/Doctrine/Orm/Filter/DateFilterTest.php similarity index 95% rename from tests/Core/Bridge/Doctrine/Orm/Filter/DateFilterTest.php rename to tests/Doctrine/Orm/Filter/DateFilterTest.php index e52ed5b7db0..5a1a8a719ce 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/DateFilterTest.php +++ b/tests/Doctrine/Orm/Filter/DateFilterTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; -use ApiPlatform\Core\Test\DoctrineOrmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\DateFilterTestTrait; +use ApiPlatform\Doctrine\Orm\Filter\DateFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; +use ApiPlatform\Test\DoctrineOrmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\DateFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyDate; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyImmutableDate; diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/ExistsFilterTest.php b/tests/Doctrine/Orm/Filter/ExistsFilterTest.php similarity index 93% rename from tests/Core/Bridge/Doctrine/Orm/Filter/ExistsFilterTest.php rename to tests/Doctrine/Orm/Filter/ExistsFilterTest.php index 01d56b1b4d6..598cc48da5a 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/ExistsFilterTest.php +++ b/tests/Doctrine/Orm/Filter/ExistsFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\ExistsFilter; -use ApiPlatform\Core\Test\DoctrineOrmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\ExistsFilterTestTrait; +use ApiPlatform\Doctrine\Orm\Filter\ExistsFilter; +use ApiPlatform\Test\DoctrineOrmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\ExistsFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; use Doctrine\Persistence\ManagerRegistry; @@ -256,8 +256,8 @@ function (ManagerRegistry $managerRegistry, array $properties = null, RequestSta /** * @group legacy * @expectedDeprecation Passing an instance of "Symfony\Component\HttpFoundation\RequestStack" is deprecated since 2.2. Use "filters" context key instead. - * @expectedDeprecation Using "ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter::apply()" is deprecated since 2.2. Use "ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter::apply()" with the "filters" context key instead. - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter::extractProperties()" is deprecated since 2.2. Use the "filters" key of the context instead. + * @expectedDeprecation Using "ApiPlatform\Doctrine\Orm\Filter\AbstractFilter::apply()" is deprecated since 2.2. Use "ApiPlatform\Doctrine\Orm\Filter\AbstractContextAwareFilter::apply()" with the "filters" context key instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Filter\AbstractFilter::extractProperties()" is deprecated since 2.2. Use the "filters" key of the context instead. * @expectedDeprecation The ExistsFilter syntax "description[exists]=true/false" is deprecated since 2.5. Use the syntax "exists[description]=true/false" instead. */ public function testLegacyRequest() diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/NumericFilterTest.php b/tests/Doctrine/Orm/Filter/NumericFilterTest.php similarity index 93% rename from tests/Core/Bridge/Doctrine/Orm/Filter/NumericFilterTest.php rename to tests/Doctrine/Orm/Filter/NumericFilterTest.php index 36a602da191..5e2962077e9 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/NumericFilterTest.php +++ b/tests/Doctrine/Orm/Filter/NumericFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\NumericFilter; -use ApiPlatform\Core\Test\DoctrineOrmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\NumericFilterTestTrait; +use ApiPlatform\Doctrine\Orm\Filter\NumericFilter; +use ApiPlatform\Test\DoctrineOrmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\NumericFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; /** diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/OrderFilterTest.php b/tests/Doctrine/Orm/Filter/OrderFilterTest.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Orm/Filter/OrderFilterTest.php rename to tests/Doctrine/Orm/Filter/OrderFilterTest.php index 1c91b5d6ec1..9c15f73df35 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/OrderFilterTest.php +++ b/tests/Doctrine/Orm/Filter/OrderFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter; -use ApiPlatform\Core\Test\DoctrineOrmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\OrderFilterTestTrait; +use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; +use ApiPlatform\Test\DoctrineOrmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\OrderFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\EmbeddedDummy; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/RangeFilterTest.php b/tests/Doctrine/Orm/Filter/RangeFilterTest.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Orm/Filter/RangeFilterTest.php rename to tests/Doctrine/Orm/Filter/RangeFilterTest.php index 971911e12fb..718c7b00ef4 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/RangeFilterTest.php +++ b/tests/Doctrine/Orm/Filter/RangeFilterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\RangeFilter; -use ApiPlatform\Core\Test\DoctrineOrmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\RangeFilterTestTrait; +use ApiPlatform\Doctrine\Orm\Filter\RangeFilter; +use ApiPlatform\Test\DoctrineOrmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\RangeFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; /** diff --git a/tests/Core/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php b/tests/Doctrine/Orm/Filter/SearchFilterTest.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php rename to tests/Doctrine/Orm/Filter/SearchFilterTest.php index 10c590245f2..815f8d5819a 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php +++ b/tests/Doctrine/Orm/Filter/SearchFilterTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter; +namespace ApiPlatform\Tests\Doctrine\Orm\Filter; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; -use ApiPlatform\Core\Test\DoctrineOrmFilterTestCase; -use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\SearchFilterTestTrait; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Test\DoctrineOrmFilterTestCase; +use ApiPlatform\Tests\Doctrine\Common\Filter\SearchFilterTestTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; diff --git a/tests/Core/Bridge/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactoryTest.php b/tests/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactoryTest.php similarity index 97% rename from tests/Core/Bridge/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactoryTest.php rename to tests/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactoryTest.php index 49ef395a9dc..9cd2102afd8 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactoryTest.php +++ b/tests/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactoryTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Metadata\Property; +namespace ApiPlatform\Tests\Doctrine\Orm\Metadata\Property; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyPropertyWithDefaultValue; diff --git a/tests/Core/Bridge/Doctrine/Orm/PaginatorTest.php b/tests/Doctrine/Orm/PaginatorTest.php similarity index 98% rename from tests/Core/Bridge/Doctrine/Orm/PaginatorTest.php rename to tests/Doctrine/Orm/PaginatorTest.php index a32b443a659..09ae2ac5fd6 100644 --- a/tests/Core/Bridge/Doctrine/Orm/PaginatorTest.php +++ b/tests/Doctrine/Orm/PaginatorTest.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Paginator; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Paginator; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Tests\Fixtures\Query; use Doctrine\ORM\Tools\Pagination\Paginator as DoctrinePaginator; diff --git a/tests/Bridge/Doctrine/Orm/State/CollectionProviderTest.php b/tests/Doctrine/Orm/State/CollectionProviderTest.php similarity index 96% rename from tests/Bridge/Doctrine/Orm/State/CollectionProviderTest.php rename to tests/Doctrine/Orm/State/CollectionProviderTest.php index a35cb230099..d564cc19dc6 100644 --- a/tests/Bridge/Doctrine/Orm/State/CollectionProviderTest.php +++ b/tests/Doctrine/Orm/State/CollectionProviderTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\Orm\State; +namespace ApiPlatform\Tests\Doctrine\Orm\State; -use ApiPlatform\Bridge\Doctrine\Orm\State\CollectionProvider; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\State\CollectionProvider; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Get; diff --git a/tests/Bridge/Doctrine/Orm/State/ItemProviderTest.php b/tests/Doctrine/Orm/State/ItemProviderTest.php similarity index 98% rename from tests/Bridge/Doctrine/Orm/State/ItemProviderTest.php rename to tests/Doctrine/Orm/State/ItemProviderTest.php index 0f525900d7a..ab2690aaae8 100644 --- a/tests/Bridge/Doctrine/Orm/State/ItemProviderTest.php +++ b/tests/Doctrine/Orm/State/ItemProviderTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine\Orm\State; +namespace ApiPlatform\Tests\Doctrine\Orm\State; -use ApiPlatform\Bridge\Doctrine\Orm\State\ItemProvider; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Identifier\IdentifierConverterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryResultItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\State\ItemProvider; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiResource; diff --git a/tests/Bridge/Doctrine/ProcessorTest.php b/tests/Doctrine/Orm/State/ProcessorTest.php similarity index 99% rename from tests/Bridge/Doctrine/ProcessorTest.php rename to tests/Doctrine/Orm/State/ProcessorTest.php index 2ec0fcbad15..c9ea8506b0b 100644 --- a/tests/Bridge/Doctrine/ProcessorTest.php +++ b/tests/Doctrine/Orm/State/ProcessorTest.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Doctrine; +namespace ApiPlatform\Tests\Doctrine\Orm\State; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Doctrine\Orm\State\Processor; diff --git a/tests/Core/Bridge/Doctrine/Orm/Util/QueryBuilderHelperTest.php b/tests/Doctrine/Orm/Util/QueryBuilderHelperTest.php similarity index 96% rename from tests/Core/Bridge/Doctrine/Orm/Util/QueryBuilderHelperTest.php rename to tests/Doctrine/Orm/Util/QueryBuilderHelperTest.php index 9811fb58b5f..f3af0c0eddc 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Util/QueryBuilderHelperTest.php +++ b/tests/Doctrine/Orm/Util/QueryBuilderHelperTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Tests\Doctrine\Orm\Util; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; use Doctrine\ORM\EntityManagerInterface; diff --git a/tests/Core/Bridge/Doctrine/Orm/Util/QueryCheckerTest.php b/tests/Doctrine/Orm/Util/QueryCheckerTest.php similarity index 92% rename from tests/Core/Bridge/Doctrine/Orm/Util/QueryCheckerTest.php rename to tests/Doctrine/Orm/Util/QueryCheckerTest.php index 458f6edcffb..cce39743b12 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Util/QueryCheckerTest.php +++ b/tests/Doctrine/Orm/Util/QueryCheckerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Tests\Doctrine\Orm\Util; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryChecker; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; use Doctrine\ORM\EntityManagerInterface; @@ -206,7 +206,7 @@ public function testHasOrderByOnFetchJoinedToManyAssociationWithJoinByAssociatio /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. */ public function testHasOrderByOnToManyJoinWithoutJoin() { @@ -224,7 +224,7 @@ public function testHasOrderByOnToManyJoinWithoutJoin() /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. */ public function testHasOrderByOnToManyJoinWithoutOrderBy() { @@ -242,7 +242,7 @@ public function testHasOrderByOnToManyJoinWithoutOrderBy() /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. */ public function testHasOrderByOnToManyJoinNotFetchJoined() { @@ -278,7 +278,7 @@ public function testHasOrderByOnToManyJoinNotFetchJoined() /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnToManyJoin()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Doctrine\Orm\Util\QueryChecker::hasOrderByOnFetchJoinedToManyAssociation()" instead. */ public function testHasOrderByOnToManyWithJoinByAssociation() { diff --git a/tests/Core/Bridge/Doctrine/Orm/Util/QueryJoinParserTest.php b/tests/Doctrine/Orm/Util/QueryJoinParserTest.php similarity index 70% rename from tests/Core/Bridge/Doctrine/Orm/Util/QueryJoinParserTest.php rename to tests/Doctrine/Orm/Util/QueryJoinParserTest.php index 7a75bbc4f5a..7cec3574900 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Util/QueryJoinParserTest.php +++ b/tests/Doctrine/Orm/Util/QueryJoinParserTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Tests\Doctrine\Orm\Util; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Util\QueryJoinParser; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; use Doctrine\ORM\EntityManagerInterface; @@ -34,7 +34,7 @@ class QueryJoinParserTest extends TestCase /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::getClassMetadataFromJoinAlias()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper::getEntityClassByAlias()" instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::getClassMetadataFromJoinAlias()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper::getEntityClassByAlias()" instead. */ public function testGetClassMetadataFromJoinAliasWithJoinByAssociation(): void { @@ -65,7 +65,7 @@ public function testGetClassMetadataFromJoinAliasWithJoinByAssociation(): void /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::getClassMetadataFromJoinAlias()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper::getEntityClassByAlias()" instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::getClassMetadataFromJoinAlias()" is deprecated since 2.4 and will be removed in 3.0. Use "ApiPlatform\Doctrine\Orm\Util\QueryBuilderHelper::getEntityClassByAlias()" instead. */ public function testGetClassMetadataFromJoinAliasWithJoinByClass(): void { @@ -88,7 +88,7 @@ public function testGetClassMetadataFromJoinAliasWithJoinByClass(): void /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::getJoinRelationship()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getJoin()" directly instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::getJoinRelationship()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getJoin()" directly instead. */ public function testGetJoinRelationshipWithJoin() { @@ -98,7 +98,7 @@ public function testGetJoinRelationshipWithJoin() /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::getJoinRelationship()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getJoin()" directly instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::getJoinRelationship()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getJoin()" directly instead. */ public function testGetJoinRelationshipWithClassJoin() { @@ -108,7 +108,7 @@ public function testGetJoinRelationshipWithClassJoin() /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::getJoinAlias()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getAlias()" directly instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::getJoinAlias()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getAlias()" directly instead. */ public function testGetJoinAliasWithJoin() { @@ -118,7 +118,7 @@ public function testGetJoinAliasWithJoin() /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::getJoinAlias()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getAlias()" directly instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::getJoinAlias()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\Join::getAlias()" directly instead. */ public function testGetJoinAliasWithClassJoin() { @@ -128,7 +128,7 @@ public function testGetJoinAliasWithClassJoin() /** * @group legacy - * @expectedDeprecation The use of "ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryJoinParser::getOrderByParts()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\OrderBy::getParts()" directly instead. + * @expectedDeprecation The use of "ApiPlatform\Doctrine\Orm\Util\QueryJoinParser::getOrderByParts()" is deprecated since 2.3 and will be removed in 3.0. Use "Doctrine\ORM\Query\Expr\OrderBy::getParts()" directly instead. */ public function testGetOrderByPartsWithOrderBy() { diff --git a/tests/Core/Bridge/Doctrine/Orm/Util/QueryNameGeneratorTest.php b/tests/Doctrine/Orm/Util/QueryNameGeneratorTest.php similarity index 86% rename from tests/Core/Bridge/Doctrine/Orm/Util/QueryNameGeneratorTest.php rename to tests/Doctrine/Orm/Util/QueryNameGeneratorTest.php index ddffeb24912..133bf22839f 100644 --- a/tests/Core/Bridge/Doctrine/Orm/Util/QueryNameGeneratorTest.php +++ b/tests/Doctrine/Orm/Util/QueryNameGeneratorTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Util; +namespace ApiPlatform\Tests\Doctrine\Orm\Util; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGenerator; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Core/Documentation/Action/DocumentationActionTest.php b/tests/Documentation/Action/DocumentationActionTest.php similarity index 93% rename from tests/Core/Documentation/Action/DocumentationActionTest.php rename to tests/Documentation/Action/DocumentationActionTest.php index 4d6556d49ba..cdfa3538891 100644 --- a/tests/Core/Documentation/Action/DocumentationActionTest.php +++ b/tests/Documentation/Action/DocumentationActionTest.php @@ -11,18 +11,18 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Documentation\Action; +namespace ApiPlatform\Tests\Documentation\Action; use ApiPlatform\Core\Api\FormatsProviderInterface; -use ApiPlatform\Core\Documentation\Action\DocumentationAction; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; -use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface; -use ApiPlatform\Core\OpenApi\Model\Info; -use ApiPlatform\Core\OpenApi\Model\Paths; -use ApiPlatform\Core\OpenApi\OpenApi; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\Action\DocumentationAction; +use ApiPlatform\Documentation\Documentation; +use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface; +use ApiPlatform\OpenApi\Model\Info; +use ApiPlatform\OpenApi\Model\Paths; +use ApiPlatform\OpenApi\OpenApi; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; @@ -38,7 +38,7 @@ class DocumentationActionTest extends TestCase /** * @group legacy - * @expectedDeprecation Not passing an instance of "ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface" as 7th parameter of the constructor of "ApiPlatform\Core\Documentation\Action\DocumentationAction" is deprecated since API Platform 2.6 + * @expectedDeprecation Not passing an instance of "ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface" as 7th parameter of the constructor of "ApiPlatform\Documentation\Action\DocumentationAction" is deprecated since API Platform 2.6 */ public function testDocumentationAction(): void { @@ -86,7 +86,7 @@ public function testLegacyDocumentationAction(): void /** * @group legacy - * @expectedDeprecation Passing an array or an instance of "ApiPlatform\Core\Api\FormatsProviderInterface" as 5th parameter of the constructor of "ApiPlatform\Core\Documentation\Action\DocumentationAction" is deprecated since API Platform 2.5 + * @expectedDeprecation Passing an array or an instance of "ApiPlatform\Core\Api\FormatsProviderInterface" as 5th parameter of the constructor of "ApiPlatform\Documentation\Action\DocumentationAction" is deprecated since API Platform 2.5 */ public function testDocumentationActionFormatDeprecation() { diff --git a/tests/Core/Bridge/Elasticsearch/Exception/IndexNotFoundExceptionTest.php b/tests/Elasticsearch/Exception/IndexNotFoundExceptionTest.php similarity index 82% rename from tests/Core/Bridge/Elasticsearch/Exception/IndexNotFoundExceptionTest.php rename to tests/Elasticsearch/Exception/IndexNotFoundExceptionTest.php index fc93fd56b82..d3388b4c07a 100644 --- a/tests/Core/Bridge/Elasticsearch/Exception/IndexNotFoundExceptionTest.php +++ b/tests/Elasticsearch/Exception/IndexNotFoundExceptionTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Exception; +namespace ApiPlatform\Tests\Elasticsearch\Exception; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; use ApiPlatform\Exception\ExceptionInterface; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Elasticsearch/Exception/NonUniqueIdentifierExceptionTest.php b/tests/Elasticsearch/Exception/NonUniqueIdentifierExceptionTest.php similarity index 81% rename from tests/Core/Bridge/Elasticsearch/Exception/NonUniqueIdentifierExceptionTest.php rename to tests/Elasticsearch/Exception/NonUniqueIdentifierExceptionTest.php index 0835502e46a..f9771a04661 100644 --- a/tests/Core/Bridge/Elasticsearch/Exception/NonUniqueIdentifierExceptionTest.php +++ b/tests/Elasticsearch/Exception/NonUniqueIdentifierExceptionTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Exception; +namespace ApiPlatform\Tests\Elasticsearch\Exception; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\NonUniqueIdentifierException; +use ApiPlatform\Elasticsearch\Exception\NonUniqueIdentifierException; use PHPUnit\Framework\TestCase; class NonUniqueIdentifierExceptionTest extends TestCase diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/Extension/ConstantScoreFilterExtensionTest.php b/tests/Elasticsearch/Extension/ConstantScoreFilterExtensionTest.php similarity index 89% rename from tests/Core/Bridge/Elasticsearch/DataProvider/Extension/ConstantScoreFilterExtensionTest.php rename to tests/Elasticsearch/Extension/ConstantScoreFilterExtensionTest.php index 7ec46adfbde..ecc963ee5f5 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/Extension/ConstantScoreFilterExtensionTest.php +++ b/tests/Elasticsearch/Extension/ConstantScoreFilterExtensionTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Tests\Elasticsearch\Extension; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\ConstantScoreFilterExtension; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\ConstantScoreFilterInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\SortFilterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Extension\ConstantScoreFilterExtension; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; +use ApiPlatform\Elasticsearch\Filter\ConstantScoreFilterInterface; +use ApiPlatform\Elasticsearch\Filter\SortFilterInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/Extension/SortExtensionTest.php b/tests/Elasticsearch/Extension/SortExtensionTest.php similarity index 95% rename from tests/Core/Bridge/Elasticsearch/DataProvider/Extension/SortExtensionTest.php rename to tests/Elasticsearch/Extension/SortExtensionTest.php index d5fda822178..408027b4750 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/Extension/SortExtensionTest.php +++ b/tests/Elasticsearch/Extension/SortExtensionTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Tests\Elasticsearch\Extension; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\SortExtension; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; +use ApiPlatform\Elasticsearch\Extension\SortExtension; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/Extension/SortFilterExtensionTest.php b/tests/Elasticsearch/Extension/SortFilterExtensionTest.php similarity index 88% rename from tests/Core/Bridge/Elasticsearch/DataProvider/Extension/SortFilterExtensionTest.php rename to tests/Elasticsearch/Extension/SortFilterExtensionTest.php index 1d60d9e770d..226ebd6d5e1 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/Extension/SortFilterExtensionTest.php +++ b/tests/Elasticsearch/Extension/SortFilterExtensionTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider\Extension; +namespace ApiPlatform\Tests\Elasticsearch\Extension; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\SortFilterExtension; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\ConstantScoreFilterInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\SortFilterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; +use ApiPlatform\Elasticsearch\Extension\SortFilterExtension; +use ApiPlatform\Elasticsearch\Filter\ConstantScoreFilterInterface; +use ApiPlatform\Elasticsearch\Filter\SortFilterInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/Filter/MatchFilterTest.php b/tests/Elasticsearch/Filter/MatchFilterTest.php similarity index 98% rename from tests/Core/Bridge/Elasticsearch/DataProvider/Filter/MatchFilterTest.php rename to tests/Elasticsearch/Filter/MatchFilterTest.php index bf332c5e61a..459b9890d2e 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/Filter/MatchFilterTest.php +++ b/tests/Elasticsearch/Filter/MatchFilterTest.php @@ -11,17 +11,17 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Tests\Elasticsearch\Filter; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\ConstantScoreFilterInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\MatchFilter; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Filter\ConstantScoreFilterInterface; +use ApiPlatform\Elasticsearch\Filter\MatchFilter; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/Filter/OrderFilterTest.php b/tests/Elasticsearch/Filter/OrderFilterTest.php similarity index 96% rename from tests/Core/Bridge/Elasticsearch/DataProvider/Filter/OrderFilterTest.php rename to tests/Elasticsearch/Filter/OrderFilterTest.php index 87ccc1f5a98..a23a8ee6a4d 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/Filter/OrderFilterTest.php +++ b/tests/Elasticsearch/Filter/OrderFilterTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Tests\Elasticsearch\Filter; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\SortFilterInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Filter\OrderFilter; +use ApiPlatform\Elasticsearch\Filter\SortFilterInterface; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/Filter/TermFilterTest.php b/tests/Elasticsearch/Filter/TermFilterTest.php similarity index 98% rename from tests/Core/Bridge/Elasticsearch/DataProvider/Filter/TermFilterTest.php rename to tests/Elasticsearch/Filter/TermFilterTest.php index a6e23750a26..2fe792eff9c 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/Filter/TermFilterTest.php +++ b/tests/Elasticsearch/Filter/TermFilterTest.php @@ -11,17 +11,17 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider\Filter; +namespace ApiPlatform\Tests\Elasticsearch\Filter; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\ConstantScoreFilterInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\TermFilter; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Filter\ConstantScoreFilterInterface; +use ApiPlatform\Elasticsearch\Filter\TermFilter; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; diff --git a/tests/Core/Bridge/Elasticsearch/Metadata/Document/DocumentMetadataTest.php b/tests/Elasticsearch/Metadata/Document/DocumentMetadataTest.php similarity index 89% rename from tests/Core/Bridge/Elasticsearch/Metadata/Document/DocumentMetadataTest.php rename to tests/Elasticsearch/Metadata/Document/DocumentMetadataTest.php index daecc274e88..8b1a01dbcd0 100644 --- a/tests/Core/Bridge/Elasticsearch/Metadata/Document/DocumentMetadataTest.php +++ b/tests/Elasticsearch/Metadata/Document/DocumentMetadataTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Metadata\Document; +namespace ApiPlatform\Tests\Elasticsearch\Metadata\Document; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; use PHPUnit\Framework\TestCase; class DocumentMetadataTest extends TestCase diff --git a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactoryTest.php b/tests/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactoryTest.php similarity index 86% rename from tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactoryTest.php rename to tests/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactoryTest.php index 8f258131f47..6f7a6392a7e 100644 --- a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactoryTest.php +++ b/tests/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactoryTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Tests\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\AttributeDocumentMetadataFactory; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\AttributeDocumentMetadataFactory; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactoryTest.php b/tests/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactoryTest.php similarity index 94% rename from tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactoryTest.php rename to tests/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactoryTest.php index 358fde644fd..6501b6a261e 100644 --- a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactoryTest.php +++ b/tests/Elasticsearch/Metadata/Document/Factory/CachedDocumentMetadataFactoryTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Tests\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\CachedDocumentMetadataFactory; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\CachedDocumentMetadataFactory; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactoryTest.php b/tests/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactoryTest.php similarity index 92% rename from tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactoryTest.php rename to tests/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactoryTest.php index 620d7f71ed3..87cda14a0e7 100644 --- a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactoryTest.php +++ b/tests/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactoryTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Tests\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\CatDocumentMetadataFactory; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\CatDocumentMetadataFactory; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use Elasticsearch\Client; use Elasticsearch\Common\Exceptions\Missing404Exception; diff --git a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactoryTest.php b/tests/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactoryTest.php similarity index 85% rename from tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactoryTest.php rename to tests/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactoryTest.php index 6a8254079df..33ed62e56e3 100644 --- a/tests/Core/Bridge/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactoryTest.php +++ b/tests/Elasticsearch/Metadata/Document/Factory/ConfiguredDocumentMetadataFactoryTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Metadata\Document\Factory; +namespace ApiPlatform\Tests\Elasticsearch\Metadata\Document\Factory; -use ApiPlatform\Core\Bridge\Elasticsearch\Exception\IndexNotFoundException; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\DocumentMetadata; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\ConfiguredDocumentMetadataFactory; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException; +use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\ConfiguredDocumentMetadataFactory; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Elasticsearch/DataProvider/PaginatorTest.php b/tests/Elasticsearch/PaginatorTest.php similarity index 97% rename from tests/Core/Bridge/Elasticsearch/DataProvider/PaginatorTest.php rename to tests/Elasticsearch/PaginatorTest.php index 38650317a0c..a5d0897c346 100644 --- a/tests/Core/Bridge/Elasticsearch/DataProvider/PaginatorTest.php +++ b/tests/Elasticsearch/PaginatorTest.php @@ -14,9 +14,9 @@ namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider; use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Paginator; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\DocumentNormalizer; -use ApiPlatform\Core\DataProvider\PaginatorInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer; +use ApiPlatform\State\Pagination\PaginatorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; diff --git a/tests/Core/Bridge/Elasticsearch/Serializer/DocumentNormalizerTest.php b/tests/Elasticsearch/Serializer/DocumentNormalizerTest.php similarity index 95% rename from tests/Core/Bridge/Elasticsearch/Serializer/DocumentNormalizerTest.php rename to tests/Elasticsearch/Serializer/DocumentNormalizerTest.php index 27936583423..109a1f4a3c4 100644 --- a/tests/Core/Bridge/Elasticsearch/Serializer/DocumentNormalizerTest.php +++ b/tests/Elasticsearch/Serializer/DocumentNormalizerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Serializer; +namespace ApiPlatform\Tests\Elasticsearch\Serializer; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\DocumentNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Exception\LogicException; diff --git a/tests/Core/Bridge/Elasticsearch/Serializer/ItemNormalizerTest.php b/tests/Elasticsearch/Serializer/ItemNormalizerTest.php similarity index 96% rename from tests/Core/Bridge/Elasticsearch/Serializer/ItemNormalizerTest.php rename to tests/Elasticsearch/Serializer/ItemNormalizerTest.php index 89d259b5932..481f8ca6652 100644 --- a/tests/Core/Bridge/Elasticsearch/Serializer/ItemNormalizerTest.php +++ b/tests/Elasticsearch/Serializer/ItemNormalizerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Serializer; +namespace ApiPlatform\Tests\Elasticsearch\Serializer; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\DocumentNormalizer; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\ItemNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer; +use ApiPlatform\Elasticsearch\Serializer\ItemNormalizer; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Exception\LogicException; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; diff --git a/tests/Core/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverterTest.php b/tests/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverterTest.php similarity index 91% rename from tests/Core/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverterTest.php rename to tests/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverterTest.php index 2fdc4f382d7..97787c9a68b 100644 --- a/tests/Core/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverterTest.php +++ b/tests/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverterTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Serializer\NameConverter; +namespace ApiPlatform\Tests\Elasticsearch\Serializer\NameConverter; -use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\NameConverter\InnerFieldsNameConverter; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Serializer\NameConverter\InnerFieldsNameConverter; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface; diff --git a/tests/Core/Bridge/Elasticsearch/Util/FieldDatatypeTraitTest.php b/tests/Elasticsearch/Util/FieldDatatypeTraitTest.php similarity index 97% rename from tests/Core/Bridge/Elasticsearch/Util/FieldDatatypeTraitTest.php rename to tests/Elasticsearch/Util/FieldDatatypeTraitTest.php index 98d1117fc7c..4d72fc7a5b4 100644 --- a/tests/Core/Bridge/Elasticsearch/Util/FieldDatatypeTraitTest.php +++ b/tests/Elasticsearch/Util/FieldDatatypeTraitTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\Util; +namespace ApiPlatform\Tests\Elasticsearch\Util; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\Util\FieldDatatypeTrait; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Elasticsearch\Util\FieldDatatypeTrait; use ApiPlatform\Exception\PropertyNotFoundException; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Foo; diff --git a/tests/Fixtures/DummyEntityFilterAnnotated.php b/tests/Fixtures/DummyEntityFilterAnnotated.php index 6aeba6fe078..3801ff315e1 100644 --- a/tests/Fixtures/DummyEntityFilterAnnotated.php +++ b/tests/Fixtures/DummyEntityFilterAnnotated.php @@ -14,7 +14,7 @@ namespace ApiPlatform\Tests\Fixtures; use ApiPlatform\Core\Annotation\ApiFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; /** * @ApiFilter(OrderFilter::class, arguments={"orderParameterName"="positionOrder"}, properties={"position"}) diff --git a/tests/Fixtures/Elasticsearch/Model/Tweet.php b/tests/Fixtures/Elasticsearch/Model/Tweet.php index 4a516778b38..d75f7d37a7e 100644 --- a/tests/Fixtures/Elasticsearch/Model/Tweet.php +++ b/tests/Fixtures/Elasticsearch/Model/Tweet.php @@ -16,8 +16,8 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiProperty; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\MatchFilter; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\OrderFilter; +use ApiPlatform\Elasticsearch\Filter\MatchFilter; +use ApiPlatform\Elasticsearch\Filter\OrderFilter; use Symfony\Component\Serializer\Annotation\Groups; /** diff --git a/tests/Fixtures/Elasticsearch/Model/User.php b/tests/Fixtures/Elasticsearch/Model/User.php index 039f6a35254..8f0dc9c4d0a 100644 --- a/tests/Fixtures/Elasticsearch/Model/User.php +++ b/tests/Fixtures/Elasticsearch/Model/User.php @@ -16,7 +16,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiProperty; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\TermFilter; +use ApiPlatform\Elasticsearch\Filter\TermFilter; use Symfony\Component\Serializer\Annotation\Groups; /** diff --git a/tests/Fixtures/NullPurger.php b/tests/Fixtures/NullPurger.php index 97f5cee6e0d..7a8d4ea5fa3 100644 --- a/tests/Fixtures/NullPurger.php +++ b/tests/Fixtures/NullPurger.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures; -use ApiPlatform\Core\HttpCache\PurgerInterface; +use ApiPlatform\HttpCache\PurgerInterface; /** * @author Kévin Dunglas diff --git a/tests/Fixtures/TestBundle/Action/ConfigCustom.php b/tests/Fixtures/TestBundle/Action/ConfigCustom.php index d5bab253778..580fe839e07 100644 --- a/tests/Fixtures/TestBundle/Action/ConfigCustom.php +++ b/tests/Fixtures/TestBundle/Action/ConfigCustom.php @@ -14,7 +14,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Action; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; -use ApiPlatform\Core\Util\RequestAttributesExtractor; +use ApiPlatform\Util\RequestAttributesExtractor; use Symfony\Component\HttpFoundation\Request; /** diff --git a/tests/Fixtures/TestBundle/DataProvider/DummyDtoNoInputCollectionDataProvider.php b/tests/Fixtures/TestBundle/DataProvider/DummyDtoNoInputCollectionDataProvider.php index c39d4832dc0..d94b34abfb0 100644 --- a/tests/Fixtures/TestBundle/DataProvider/DummyDtoNoInputCollectionDataProvider.php +++ b/tests/Fixtures/TestBundle/DataProvider/DummyDtoNoInputCollectionDataProvider.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataProvider; -use ApiPlatform\Core\DataProvider\ArrayPaginator; use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; +use ApiPlatform\State\Pagination\ArrayPaginator; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoNoInput as DummyDtoNoInputDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\Document\OutputDto as OutputDtoDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; diff --git a/tests/Fixtures/TestBundle/DataTransformer/CustomInputDtoDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/CustomInputDtoDataTransformer.php index a7a5db0212a..5c960a28493 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/CustomInputDtoDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/CustomInputDtoDataTransformer.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; +use ApiPlatform\DataTransformer\DataTransformerInterface; +use ApiPlatform\Serializer\AbstractItemNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoCustom as DummyDtoCustomDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\CustomInputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyDtoCustom; diff --git a/tests/Fixtures/TestBundle/DataTransformer/CustomOutputDtoDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/CustomOutputDtoDataTransformer.php index 0e3586e10bf..a7b5e5847aa 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/CustomOutputDtoDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/CustomOutputDtoDataTransformer.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoCustom as DummyDtoCustomDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\CustomOutputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyDtoCustom; diff --git a/tests/Fixtures/TestBundle/DataTransformer/DummyDtoNoInputToOutputDtoDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/DummyDtoNoInputToOutputDtoDataTransformer.php index e9eb4cb7d2e..73a7b67114f 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/DummyDtoNoInputToOutputDtoDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/DummyDtoNoInputToOutputDtoDataTransformer.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoNoInput as DummyDtoNoInputDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\Document\OutputDto as OutputDtoDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; diff --git a/tests/Fixtures/TestBundle/DataTransformer/InitializeInputDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/InitializeInputDataTransformer.php index 95e2c2d19a7..3281c5dd92e 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/InitializeInputDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/InitializeInputDataTransformer.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; +use ApiPlatform\DataTransformer\DataTransformerInitializerInterface; +use ApiPlatform\Serializer\AbstractItemNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Document\InitializeInput as InitializeInputDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\InitializeInputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\InitializeInput; diff --git a/tests/Fixtures/TestBundle/DataTransformer/InputDtoDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/InputDtoDataTransformer.php index 282e9199a8e..2c9b603a66e 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/InputDtoDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/InputDtoDataTransformer.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; +use ApiPlatform\DataTransformer\DataTransformerInterface; +use ApiPlatform\Serializer\AbstractItemNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoInputOutput as DummyDtoInputOutputDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\Document\InputDto as InputDtoDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\InputDto; diff --git a/tests/Fixtures/TestBundle/DataTransformer/OutputDtoDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/OutputDtoDataTransformer.php index 7c297434024..8b15292ce0e 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/OutputDtoDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/OutputDtoDataTransformer.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataProvider\ArrayPaginator; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; +use ApiPlatform\State\Pagination\ArrayPaginator; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoInputOutput as DummyDtoInputOutputDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\Document\OutputDto as OutputDtoDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; diff --git a/tests/Fixtures/TestBundle/DataTransformer/OutputDtoSameClassTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/OutputDtoSameClassTransformer.php index f8a776016c1..0a3e11596d1 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/OutputDtoSameClassTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/OutputDtoSameClassTransformer.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoOutputFallbackToSameClass as DummyDtoOutputFallbackToSameClassDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyDtoOutputSameClass as DummyDtoOutputSameClassDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDtoDummy; diff --git a/tests/Fixtures/TestBundle/DataTransformer/RPCOutputDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/RPCOutputDataTransformer.php index 24d6bc442c0..e5f5a80808c 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/RPCOutputDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/RPCOutputDataTransformer.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Document\RPC as RPCDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\RPCOutput; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RPC; diff --git a/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordInputDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordInputDataTransformer.php index d9c0581d18f..1acc5df9cfd 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordInputDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordInputDataTransformer.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; +use ApiPlatform\DataTransformer\DataTransformerInterface; +use ApiPlatform\Serializer\AbstractItemNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Document\User as UserDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\RecoverPasswordInput; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\User; diff --git a/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordOutputDataTransformer.php b/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordOutputDataTransformer.php index 5a19c76b525..e62154d8f3f 100644 --- a/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordOutputDataTransformer.php +++ b/tests/Fixtures/TestBundle/DataTransformer/RecoverPasswordOutputDataTransformer.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\DataTransformer; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\RecoverPasswordOutput; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\User; diff --git a/tests/Fixtures/TestBundle/Doctrine/Orm/Filter/DummyFilter.php b/tests/Fixtures/TestBundle/Doctrine/Orm/Filter/DummyFilter.php index 6ad7b75b7d7..1838260ada9 100644 --- a/tests/Fixtures/TestBundle/Doctrine/Orm/Filter/DummyFilter.php +++ b/tests/Fixtures/TestBundle/Doctrine/Orm/Filter/DummyFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Doctrine\Orm\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class DummyFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Document/ConvertedBoolean.php b/tests/Fixtures/TestBundle/Document/ConvertedBoolean.php index 2be7ba43567..c0c2e660ac1 100644 --- a/tests/Fixtures/TestBundle/Document/ConvertedBoolean.php +++ b/tests/Fixtures/TestBundle/Document/ConvertedBoolean.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\BooleanFilter; +use ApiPlatform\Doctrine\Odm\Filter\BooleanFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** diff --git a/tests/Fixtures/TestBundle/Document/ConvertedDate.php b/tests/Fixtures/TestBundle/Document/ConvertedDate.php index 3af9f86ec90..4439ccf57e2 100644 --- a/tests/Fixtures/TestBundle/Document/ConvertedDate.php +++ b/tests/Fixtures/TestBundle/Document/ConvertedDate.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\DateFilter; +use ApiPlatform\Doctrine\Odm\Filter\DateFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** diff --git a/tests/Fixtures/TestBundle/Document/ConvertedInteger.php b/tests/Fixtures/TestBundle/Document/ConvertedInteger.php index 4f18b8fb27d..0b590cf004e 100644 --- a/tests/Fixtures/TestBundle/Document/ConvertedInteger.php +++ b/tests/Fixtures/TestBundle/Document/ConvertedInteger.php @@ -15,9 +15,9 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\NumericFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\RangeFilter; +use ApiPlatform\Doctrine\Odm\Filter\NumericFilter; +use ApiPlatform\Doctrine\Odm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Odm\Filter\RangeFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** diff --git a/tests/Fixtures/TestBundle/Document/ConvertedOwner.php b/tests/Fixtures/TestBundle/Document/ConvertedOwner.php index c531e6caff7..cfebc9e52a1 100644 --- a/tests/Fixtures/TestBundle/Document/ConvertedOwner.php +++ b/tests/Fixtures/TestBundle/Document/ConvertedOwner.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Odm\Filter\SearchFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** diff --git a/tests/Fixtures/TestBundle/Document/ConvertedString.php b/tests/Fixtures/TestBundle/Document/ConvertedString.php index d2ee7543821..09186981079 100644 --- a/tests/Fixtures/TestBundle/Document/ConvertedString.php +++ b/tests/Fixtures/TestBundle/Document/ConvertedString.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\ExistsFilter; +use ApiPlatform\Doctrine\Odm\Filter\ExistsFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** diff --git a/tests/Fixtures/TestBundle/Document/DisableItemOperation.php b/tests/Fixtures/TestBundle/Document/DisableItemOperation.php index 2ba1c744b05..aa083412728 100644 --- a/tests/Fixtures/TestBundle/Document/DisableItemOperation.php +++ b/tests/Fixtures/TestBundle/Document/DisableItemOperation.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Document; -use ApiPlatform\Core\Action\NotFoundAction; +use ApiPlatform\Action\NotFoundAction; use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; diff --git a/tests/Fixtures/TestBundle/Document/DummyCar.php b/tests/Fixtures/TestBundle/Document/DummyCar.php index bc4e45021be..8c8783d9905 100644 --- a/tests/Fixtures/TestBundle/Document/DummyCar.php +++ b/tests/Fixtures/TestBundle/Document/DummyCar.php @@ -15,11 +15,11 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\BooleanFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter; -use ApiPlatform\Core\Serializer\Filter\GroupFilter; -use ApiPlatform\Core\Serializer\Filter\PropertyFilter; +use ApiPlatform\Doctrine\Odm\Filter\BooleanFilter; +use ApiPlatform\Doctrine\Odm\Filter\DateFilter; +use ApiPlatform\Doctrine\Odm\Filter\SearchFilter; +use ApiPlatform\Serializer\Filter\GroupFilter; +use ApiPlatform\Serializer\Filter\PropertyFilter; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Symfony\Component\Serializer\Annotation as Serializer; diff --git a/tests/Fixtures/TestBundle/Document/DummyCarColor.php b/tests/Fixtures/TestBundle/Document/DummyCarColor.php index 67f59c4d918..d2f4e50d454 100644 --- a/tests/Fixtures/TestBundle/Document/DummyCarColor.php +++ b/tests/Fixtures/TestBundle/Document/DummyCarColor.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Odm\Filter\SearchFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Symfony\Component\Serializer\Annotation as Serializer; use Symfony\Component\Validator\Constraints as Assert; diff --git a/tests/Fixtures/TestBundle/Document/DummyDate.php b/tests/Fixtures/TestBundle/Document/DummyDate.php index f1af8933f47..047384ef83d 100644 --- a/tests/Fixtures/TestBundle/Document/DummyDate.php +++ b/tests/Fixtures/TestBundle/Document/DummyDate.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Odm\Filter\DateFilter; +use ApiPlatform\Doctrine\Odm\Filter\SearchFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** diff --git a/tests/Fixtures/TestBundle/Document/SoMany.php b/tests/Fixtures/TestBundle/Document/SoMany.php index eaf39c8c527..50fe29a985e 100644 --- a/tests/Fixtures/TestBundle/Document/SoMany.php +++ b/tests/Fixtures/TestBundle/Document/SoMany.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\RangeFilter; +use ApiPlatform\Doctrine\Odm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Odm\Filter\RangeFilter; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** diff --git a/tests/Fixtures/TestBundle/Entity/ConvertedBoolean.php b/tests/Fixtures/TestBundle/Entity/ConvertedBoolean.php index a9f5d84dea7..91202d65441 100644 --- a/tests/Fixtures/TestBundle/Entity/ConvertedBoolean.php +++ b/tests/Fixtures/TestBundle/Entity/ConvertedBoolean.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter; +use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Entity/ConvertedDate.php b/tests/Fixtures/TestBundle/Entity/ConvertedDate.php index 2b4db905c35..81ddd6c19ae 100644 --- a/tests/Fixtures/TestBundle/Entity/ConvertedDate.php +++ b/tests/Fixtures/TestBundle/Entity/ConvertedDate.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter; +use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Entity/ConvertedInteger.php b/tests/Fixtures/TestBundle/Entity/ConvertedInteger.php index 6fc2ccdb59f..a8a98389799 100644 --- a/tests/Fixtures/TestBundle/Entity/ConvertedInteger.php +++ b/tests/Fixtures/TestBundle/Entity/ConvertedInteger.php @@ -15,9 +15,9 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\NumericFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\RangeFilter; +use ApiPlatform\Doctrine\Orm\Filter\NumericFilter; +use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Orm\Filter\RangeFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Entity/ConvertedOwner.php b/tests/Fixtures/TestBundle/Entity/ConvertedOwner.php index ae251b7176d..9aa80e52e0e 100644 --- a/tests/Fixtures/TestBundle/Entity/ConvertedOwner.php +++ b/tests/Fixtures/TestBundle/Entity/ConvertedOwner.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Entity/ConvertedString.php b/tests/Fixtures/TestBundle/Entity/ConvertedString.php index 0bccd2f1b45..a350079aee2 100644 --- a/tests/Fixtures/TestBundle/Entity/ConvertedString.php +++ b/tests/Fixtures/TestBundle/Entity/ConvertedString.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\ExistsFilter; +use ApiPlatform\Doctrine\Orm\Filter\ExistsFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Entity/DisableItemOperation.php b/tests/Fixtures/TestBundle/Entity/DisableItemOperation.php index e659557faa9..d294b450ef9 100644 --- a/tests/Fixtures/TestBundle/Entity/DisableItemOperation.php +++ b/tests/Fixtures/TestBundle/Entity/DisableItemOperation.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity; -use ApiPlatform\Core\Action\NotFoundAction; +use ApiPlatform\Action\NotFoundAction; use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; diff --git a/tests/Fixtures/TestBundle/Entity/DummyCar.php b/tests/Fixtures/TestBundle/Entity/DummyCar.php index 8bb3cc1846f..2194f6465e3 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyCar.php +++ b/tests/Fixtures/TestBundle/Entity/DummyCar.php @@ -15,11 +15,11 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; -use ApiPlatform\Core\Serializer\Filter\GroupFilter; -use ApiPlatform\Core\Serializer\Filter\PropertyFilter; +use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; +use ApiPlatform\Doctrine\Orm\Filter\DateFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Serializer\Filter\GroupFilter; +use ApiPlatform\Serializer\Filter\PropertyFilter; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Serializer\Annotation as Serializer; diff --git a/tests/Fixtures/TestBundle/Entity/DummyCarColor.php b/tests/Fixtures/TestBundle/Entity/DummyCarColor.php index 08468c15058..6f7032b0a01 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyCarColor.php +++ b/tests/Fixtures/TestBundle/Entity/DummyCarColor.php @@ -15,7 +15,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Serializer\Annotation as Serializer; use Symfony\Component\Validator\Constraints as Assert; diff --git a/tests/Fixtures/TestBundle/Entity/DummyDate.php b/tests/Fixtures/TestBundle/Entity/DummyDate.php index a5680b394e0..bf0851ca4a2 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyDate.php +++ b/tests/Fixtures/TestBundle/Entity/DummyDate.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Orm\Filter\DateFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Entity/DummyPhp8.php b/tests/Fixtures/TestBundle/Entity/DummyPhp8.php index 1e0514f82ce..a51009436f7 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyPhp8.php +++ b/tests/Fixtures/TestBundle/Entity/DummyPhp8.php @@ -16,7 +16,7 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiProperty; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Entity/SoMany.php b/tests/Fixtures/TestBundle/Entity/SoMany.php index ba2f01c3982..b2404392ea7 100644 --- a/tests/Fixtures/TestBundle/Entity/SoMany.php +++ b/tests/Fixtures/TestBundle/Entity/SoMany.php @@ -15,8 +15,8 @@ use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Annotation\ApiResource; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\RangeFilter; +use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Orm\Filter\RangeFilter; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Fixtures/TestBundle/Filter/ArrayItemsFilter.php b/tests/Fixtures/TestBundle/Filter/ArrayItemsFilter.php index 60df195b0f3..c457e0cc2ad 100644 --- a/tests/Fixtures/TestBundle/Filter/ArrayItemsFilter.php +++ b/tests/Fixtures/TestBundle/Filter/ArrayItemsFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class ArrayItemsFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/ArrayRequiredFilter.php b/tests/Fixtures/TestBundle/Filter/ArrayRequiredFilter.php index d3449fefe73..83f59253e07 100644 --- a/tests/Fixtures/TestBundle/Filter/ArrayRequiredFilter.php +++ b/tests/Fixtures/TestBundle/Filter/ArrayRequiredFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; final class ArrayRequiredFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/BoundsFilter.php b/tests/Fixtures/TestBundle/Filter/BoundsFilter.php index f4117919cd9..3c721fbff8b 100644 --- a/tests/Fixtures/TestBundle/Filter/BoundsFilter.php +++ b/tests/Fixtures/TestBundle/Filter/BoundsFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class BoundsFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/ComplexSubQueryFilter.php b/tests/Fixtures/TestBundle/Filter/ComplexSubQueryFilter.php index 5d12e1348c3..36269271e60 100644 --- a/tests/Fixtures/TestBundle/Filter/ComplexSubQueryFilter.php +++ b/tests/Fixtures/TestBundle/Filter/ComplexSubQueryFilter.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Orm\Filter\AbstractContextAwareFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query\Expr\Join; diff --git a/tests/Fixtures/TestBundle/Filter/EnumFilter.php b/tests/Fixtures/TestBundle/Filter/EnumFilter.php index 98fa6861f55..6efd4e94d87 100644 --- a/tests/Fixtures/TestBundle/Filter/EnumFilter.php +++ b/tests/Fixtures/TestBundle/Filter/EnumFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class EnumFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/LengthFilter.php b/tests/Fixtures/TestBundle/Filter/LengthFilter.php index dc2b36feb84..8b9ad28c68b 100644 --- a/tests/Fixtures/TestBundle/Filter/LengthFilter.php +++ b/tests/Fixtures/TestBundle/Filter/LengthFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class LengthFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/MultipleOfFilter.php b/tests/Fixtures/TestBundle/Filter/MultipleOfFilter.php index 20be425d0c3..7d4f9645aaa 100644 --- a/tests/Fixtures/TestBundle/Filter/MultipleOfFilter.php +++ b/tests/Fixtures/TestBundle/Filter/MultipleOfFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class MultipleOfFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/PatternFilter.php b/tests/Fixtures/TestBundle/Filter/PatternFilter.php index 88991db0d75..044e0516f45 100644 --- a/tests/Fixtures/TestBundle/Filter/PatternFilter.php +++ b/tests/Fixtures/TestBundle/Filter/PatternFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class PatternFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/RequiredAllowEmptyFilter.php b/tests/Fixtures/TestBundle/Filter/RequiredAllowEmptyFilter.php index 42610c3a16a..6967d6138dd 100644 --- a/tests/Fixtures/TestBundle/Filter/RequiredAllowEmptyFilter.php +++ b/tests/Fixtures/TestBundle/Filter/RequiredAllowEmptyFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; class RequiredAllowEmptyFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/Filter/RequiredFilter.php b/tests/Fixtures/TestBundle/Filter/RequiredFilter.php index b45ff67afa8..19d180b0db4 100644 --- a/tests/Fixtures/TestBundle/Filter/RequiredFilter.php +++ b/tests/Fixtures/TestBundle/Filter/RequiredFilter.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Filter; -use ApiPlatform\Core\Bridge\Doctrine\Common\PropertyHelperTrait; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface; +use ApiPlatform\Doctrine\Common\PropertyHelperTrait; +use ApiPlatform\Doctrine\Orm\Filter\AbstractFilter; +use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use Doctrine\ORM\QueryBuilder; final class RequiredFilter extends AbstractFilter diff --git a/tests/Fixtures/TestBundle/GraphQl/Resolver/DummyCustomQueryNoReadAndSerializeCollectionResolver.php b/tests/Fixtures/TestBundle/GraphQl/Resolver/DummyCustomQueryNoReadAndSerializeCollectionResolver.php index c2128f934aa..ebfc0baf57c 100644 --- a/tests/Fixtures/TestBundle/GraphQl/Resolver/DummyCustomQueryNoReadAndSerializeCollectionResolver.php +++ b/tests/Fixtures/TestBundle/GraphQl/Resolver/DummyCustomQueryNoReadAndSerializeCollectionResolver.php @@ -13,9 +13,9 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\GraphQl\Resolver; -use ApiPlatform\Core\DataProvider\ArrayPaginator; use ApiPlatform\Exception\RuntimeException; use ApiPlatform\GraphQl\Resolver\QueryCollectionResolverInterface; +use ApiPlatform\State\Pagination\ArrayPaginator; use ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyCustomQuery as DummyCustomQueryDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyCustomQuery; diff --git a/tests/Fixtures/TestBundle/State/OperationResourceProcessor.php b/tests/Fixtures/TestBundle/State/OperationResourceProcessor.php index c701b219ff2..8fdbb1ef84e 100644 --- a/tests/Fixtures/TestBundle/State/OperationResourceProcessor.php +++ b/tests/Fixtures/TestBundle/State/OperationResourceProcessor.php @@ -13,10 +13,10 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\State; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Metadata\Operation; use ApiPlatform\State\ProcessorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\OperationResource; +use ApiPlatform\Util\ClassInfoTrait; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\Persistence\ManagerRegistry; diff --git a/tests/Fixtures/TestBundle/Util/AnnotationFilterExtractor.php b/tests/Fixtures/TestBundle/Util/AnnotationFilterExtractor.php index d48c3de1b16..9e2e4dbcc72 100644 --- a/tests/Fixtures/TestBundle/Util/AnnotationFilterExtractor.php +++ b/tests/Fixtures/TestBundle/Util/AnnotationFilterExtractor.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Util; -use ApiPlatform\Core\Util\AnnotationFilterExtractorTrait; +use ApiPlatform\Util\AnnotationFilterExtractorTrait; use Doctrine\Common\Annotations\Reader; class AnnotationFilterExtractor diff --git a/tests/Fixtures/TestBundle/Validator/DummyValidationGroupsGenerator.php b/tests/Fixtures/TestBundle/Validator/DummyValidationGroupsGenerator.php index 17faadd5ad2..02e1bdbbe30 100644 --- a/tests/Fixtures/TestBundle/Validator/DummyValidationGroupsGenerator.php +++ b/tests/Fixtures/TestBundle/Validator/DummyValidationGroupsGenerator.php @@ -13,7 +13,7 @@ namespace ApiPlatform\Tests\Fixtures\TestBundle\Validator; -use ApiPlatform\Core\Bridge\Symfony\Validator\ValidationGroupsGeneratorInterface; +use ApiPlatform\Symfony\Validator\ValidationGroupsGeneratorInterface; use Symfony\Component\Validator\Constraints\GroupSequence; final class DummyValidationGroupsGenerator implements ValidationGroupsGeneratorInterface diff --git a/tests/Fixtures/app/AppKernel.php b/tests/Fixtures/app/AppKernel.php index 891169d6314..09dc46f70db 100644 --- a/tests/Fixtures/app/AppKernel.php +++ b/tests/Fixtures/app/AppKernel.php @@ -11,8 +11,8 @@ declare(strict_types=1); -use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle; use ApiPlatform\Core\Tests\Behat\DoctrineContext; +use ApiPlatform\Symfony\Bundle\ApiPlatformBundle; use ApiPlatform\Tests\Fixtures\TestBundle\Document\User as UserDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\User; use ApiPlatform\Tests\Fixtures\TestBundle\TestBundle; diff --git a/tests/GraphQl/Resolver/Stage/SecurityPostDenormalizeStageTest.php b/tests/GraphQl/Resolver/Stage/SecurityPostDenormalizeStageTest.php index cee53117e7a..9a2a5908e2d 100644 --- a/tests/GraphQl/Resolver/Stage/SecurityPostDenormalizeStageTest.php +++ b/tests/GraphQl/Resolver/Stage/SecurityPostDenormalizeStageTest.php @@ -13,13 +13,13 @@ namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Stage; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\GraphQl\Resolver\Stage\SecurityPostDenormalizeStage; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GraphQl\Query; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use GraphQL\Type\Definition\ResolveInfo; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/GraphQl/Resolver/Stage/SecurityPostValidationStageTest.php b/tests/GraphQl/Resolver/Stage/SecurityPostValidationStageTest.php index f3194d3bb3f..1ba36149220 100644 --- a/tests/GraphQl/Resolver/Stage/SecurityPostValidationStageTest.php +++ b/tests/GraphQl/Resolver/Stage/SecurityPostValidationStageTest.php @@ -13,13 +13,13 @@ namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Stage; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\GraphQl\Resolver\Stage\SecurityPostValidationStage; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GraphQl\Query; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use GraphQL\Type\Definition\ResolveInfo; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/GraphQl/Resolver/Stage/SecurityStageTest.php b/tests/GraphQl/Resolver/Stage/SecurityStageTest.php index 4f59162e6d9..671e7964caf 100644 --- a/tests/GraphQl/Resolver/Stage/SecurityStageTest.php +++ b/tests/GraphQl/Resolver/Stage/SecurityStageTest.php @@ -13,13 +13,13 @@ namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Stage; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\GraphQl\Resolver\Stage\SecurityStage; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GraphQl\Query; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use GraphQL\Type\Definition\ResolveInfo; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/GraphQl/Resolver/Stage/SerializeStageTest.php b/tests/GraphQl/Resolver/Stage/SerializeStageTest.php index 75844fd421d..859c6c50e80 100644 --- a/tests/GraphQl/Resolver/Stage/SerializeStageTest.php +++ b/tests/GraphQl/Resolver/Stage/SerializeStageTest.php @@ -13,9 +13,6 @@ namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Stage; -use ApiPlatform\Core\DataProvider\ArrayPaginator; -use ApiPlatform\Core\DataProvider\Pagination; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\GraphQl\Resolver\Stage\SerializeStage; use ApiPlatform\GraphQl\Serializer\ItemNormalizer; @@ -27,6 +24,9 @@ use ApiPlatform\Metadata\GraphQl\Subscription; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\State\Pagination\ArrayPaginator; +use ApiPlatform\State\Pagination\Pagination; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use GraphQL\Type\Definition\ResolveInfo; use PHPUnit\Framework\TestCase; use Prophecy\Argument; @@ -159,7 +159,7 @@ public function applyCollectionWithPaginationProvider(): array $partialPaginatorProphecy->count()->willReturn(2); return [ - 'not paginator' => [[], [], null, \LogicException::class, 'Collection returned by the collection data provider must implement ApiPlatform\Core\DataProvider\PaginatorInterface'], + 'not paginator' => [[], [], null, \LogicException::class, 'Collection returned by the collection data provider must implement ApiPlatform\State\Pagination\PaginatorInterface'], 'empty paginator' => [new ArrayPaginator([], 0, 0), [], ['totalCount' => 0., 'edges' => [], 'pageInfo' => ['startCursor' => null, 'endCursor' => null, 'hasNextPage' => false, 'hasPreviousPage' => false]]], 'paginator' => [new ArrayPaginator([new \stdClass(), new \stdClass(), new \stdClass()], 0, 2), [], ['totalCount' => 3., 'edges' => [['node' => ['normalized_item'], 'cursor' => 'MA=='], ['node' => ['normalized_item'], 'cursor' => 'MQ==']], 'pageInfo' => ['startCursor' => 'MA==', 'endCursor' => 'MQ==', 'hasNextPage' => true, 'hasPreviousPage' => false]]], 'paginator with after cursor' => [new ArrayPaginator([new \stdClass(), new \stdClass(), new \stdClass()], 1, 2), ['after' => 'MA=='], ['totalCount' => 3., 'edges' => [['node' => ['normalized_item'], 'cursor' => 'MQ=='], ['node' => ['normalized_item'], 'cursor' => 'Mg==']], 'pageInfo' => ['startCursor' => 'MQ==', 'endCursor' => 'Mg==', 'hasNextPage' => false, 'hasPreviousPage' => true]]], diff --git a/tests/GraphQl/Resolver/Stage/ValidateStageTest.php b/tests/GraphQl/Resolver/Stage/ValidateStageTest.php index ae2ab7f31e1..119fc3e48cf 100644 --- a/tests/GraphQl/Resolver/Stage/ValidateStageTest.php +++ b/tests/GraphQl/Resolver/Stage/ValidateStageTest.php @@ -14,13 +14,13 @@ namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Stage; use ApiPlatform\Core\Tests\ProphecyTrait; -use ApiPlatform\Core\Validator\Exception\ValidationException; -use ApiPlatform\Core\Validator\ValidatorInterface; use ApiPlatform\GraphQl\Resolver\Stage\ValidateStage; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GraphQl\Query; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Symfony\EventListener\Exception\ValidationException; +use ApiPlatform\Symfony\EventListener\ValidatorInterface; use GraphQL\Type\Definition\ResolveInfo; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/GraphQl/Serializer/Exception/ValidationExceptionNormalizerTest.php b/tests/GraphQl/Serializer/Exception/ValidationExceptionNormalizerTest.php index d3251830396..c209bf9bea8 100644 --- a/tests/GraphQl/Serializer/Exception/ValidationExceptionNormalizerTest.php +++ b/tests/GraphQl/Serializer/Exception/ValidationExceptionNormalizerTest.php @@ -13,8 +13,8 @@ namespace ApiPlatform\Core\Tests\GraphQl\Serializer\Exception; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; use ApiPlatform\GraphQl\Serializer\Exception\ValidationExceptionNormalizer; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; use GraphQL\Error\Error; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\ConstraintViolation; diff --git a/tests/GraphQl/Type/FieldsBuilderTest.php b/tests/GraphQl/Type/FieldsBuilderTest.php index 8b637c84a32..a23ac3810b3 100644 --- a/tests/GraphQl/Type/FieldsBuilderTest.php +++ b/tests/GraphQl/Type/FieldsBuilderTest.php @@ -14,7 +14,6 @@ namespace ApiPlatform\Core\Tests\GraphQl\Type; use ApiPlatform\Core\Api\FilterInterface; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface; use ApiPlatform\GraphQl\Type\FieldsBuilder; @@ -33,6 +32,7 @@ use ApiPlatform\Metadata\Property\PropertyNameCollection; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\State\Pagination\Pagination; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; use GraphQL\Type\Definition\InputObjectType; use GraphQL\Type\Definition\InterfaceType; diff --git a/tests/GraphQl/Type/TypeBuilderTest.php b/tests/GraphQl/Type/TypeBuilderTest.php index 11c6f8aeb1a..e097ddfef54 100644 --- a/tests/GraphQl/Type/TypeBuilderTest.php +++ b/tests/GraphQl/Type/TypeBuilderTest.php @@ -13,7 +13,6 @@ namespace ApiPlatform\Core\Tests\GraphQl\Type; -use ApiPlatform\Core\DataProvider\Pagination; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\GraphQl\Serializer\ItemNormalizer; use ApiPlatform\GraphQl\Type\FieldsBuilderInterface; @@ -27,6 +26,7 @@ use ApiPlatform\Metadata\GraphQl\Subscription; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\State\Pagination\Pagination; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use GraphQL\Type\Definition\InputObjectType; use GraphQL\Type\Definition\InterfaceType; diff --git a/tests/Core/Hal/JsonSchema/SchemaFactoryTest.php b/tests/Hal/JsonSchema/SchemaFactoryTest.php similarity index 94% rename from tests/Core/Hal/JsonSchema/SchemaFactoryTest.php rename to tests/Hal/JsonSchema/SchemaFactoryTest.php index d9b44eb7f7f..7cf6ff4cfe2 100644 --- a/tests/Core/Hal/JsonSchema/SchemaFactoryTest.php +++ b/tests/Hal/JsonSchema/SchemaFactoryTest.php @@ -11,20 +11,20 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hal\JsonSchema; +namespace ApiPlatform\Tests\Hal\JsonSchema; use ApiPlatform\Core\Api\OperationType; -use ApiPlatform\Core\Hal\JsonSchema\SchemaFactory; -use ApiPlatform\Core\Hydra\JsonSchema\SchemaFactory as HydraSchemaFactory; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactory as BaseSchemaFactory; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hal\JsonSchema\SchemaFactory; +use ApiPlatform\Hydra\JsonSchema\SchemaFactory as HydraSchemaFactory; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactory as BaseSchemaFactory; +use ApiPlatform\JsonSchema\TypeFactoryInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Hal/Serializer/CollectionNormalizerTest.php b/tests/Hal/Serializer/CollectionNormalizerTest.php similarity index 96% rename from tests/Core/Hal/Serializer/CollectionNormalizerTest.php rename to tests/Hal/Serializer/CollectionNormalizerTest.php index 28aad3b4ce8..3d652916f12 100644 --- a/tests/Core/Hal/Serializer/CollectionNormalizerTest.php +++ b/tests/Hal/Serializer/CollectionNormalizerTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hal\Serializer; +namespace ApiPlatform\Tests\Hal\Serializer; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; -use ApiPlatform\Core\Hal\Serializer\CollectionNormalizer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hal\Serializer\CollectionNormalizer; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/tests/Core/Hal/Serializer/EntrypointNormalizerTest.php b/tests/Hal/Serializer/EntrypointNormalizerTest.php similarity index 96% rename from tests/Core/Hal/Serializer/EntrypointNormalizerTest.php rename to tests/Hal/Serializer/EntrypointNormalizerTest.php index c4d20b69267..9ba3444c936 100644 --- a/tests/Core/Hal/Serializer/EntrypointNormalizerTest.php +++ b/tests/Hal/Serializer/EntrypointNormalizerTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hal\Serializer; +namespace ApiPlatform\Tests\Hal\Serializer; use ApiPlatform\Core\Api\Entrypoint; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Hal\Serializer\EntrypointNormalizer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hal\Serializer\EntrypointNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Hal/Serializer/ItemNormalizerTest.php b/tests/Hal/Serializer/ItemNormalizerTest.php similarity index 99% rename from tests/Core/Hal/Serializer/ItemNormalizerTest.php rename to tests/Hal/Serializer/ItemNormalizerTest.php index b948a6bf7e5..6e37b9d8d17 100644 --- a/tests/Core/Hal/Serializer/ItemNormalizerTest.php +++ b/tests/Hal/Serializer/ItemNormalizerTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hal\Serializer; +namespace ApiPlatform\Tests\Hal\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Hal\Serializer\ItemNormalizer; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hal\Serializer\ItemNormalizer; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\MaxDepthDummy; diff --git a/tests/Core/Hal/Serializer/ObjectNormalizerTest.php b/tests/Hal/Serializer/ObjectNormalizerTest.php similarity index 95% rename from tests/Core/Hal/Serializer/ObjectNormalizerTest.php rename to tests/Hal/Serializer/ObjectNormalizerTest.php index deb72710019..b28011457a9 100644 --- a/tests/Core/Hal/Serializer/ObjectNormalizerTest.php +++ b/tests/Hal/Serializer/ObjectNormalizerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hal\Serializer; +namespace ApiPlatform\Tests\Hal\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; -use ApiPlatform\Core\Hal\Serializer\ObjectNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hal\Serializer\ObjectNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Exception\LogicException; diff --git a/tests/Core/HttpCache/EventListener/AddHeadersListenerTest.php b/tests/HttpCache/EventListener/AddHeadersListenerTest.php similarity index 98% rename from tests/Core/HttpCache/EventListener/AddHeadersListenerTest.php rename to tests/HttpCache/EventListener/AddHeadersListenerTest.php index 02edeb527ad..21b490d3c9b 100644 --- a/tests/Core/HttpCache/EventListener/AddHeadersListenerTest.php +++ b/tests/HttpCache/EventListener/AddHeadersListenerTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\HttpCache\EventListener; +namespace ApiPlatform\Tests\HttpCache\EventListener; -use ApiPlatform\Core\HttpCache\EventListener\AddHeadersListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\HttpCache\EventListener\AddHeadersListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/HttpCache/EventListener/AddTagsListenerTest.php b/tests/HttpCache/EventListener/AddTagsListenerTest.php similarity index 98% rename from tests/Core/HttpCache/EventListener/AddTagsListenerTest.php rename to tests/HttpCache/EventListener/AddTagsListenerTest.php index 2b909faf0d8..ca0e392a757 100644 --- a/tests/Core/HttpCache/EventListener/AddTagsListenerTest.php +++ b/tests/HttpCache/EventListener/AddTagsListenerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\HttpCache\EventListener; +namespace ApiPlatform\Tests\HttpCache\EventListener; use ApiPlatform\Api\IriConverterInterface; -use ApiPlatform\Core\HttpCache\EventListener\AddTagsListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\HttpCache\EventListener\AddTagsListener; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\GetCollection; use ApiPlatform\Metadata\Operations; diff --git a/tests/Core/HttpCache/VarnishPurgerTest.php b/tests/HttpCache/VarnishPurgerTest.php similarity index 98% rename from tests/Core/HttpCache/VarnishPurgerTest.php rename to tests/HttpCache/VarnishPurgerTest.php index d4827876f1d..4c643684d2c 100644 --- a/tests/Core/HttpCache/VarnishPurgerTest.php +++ b/tests/HttpCache/VarnishPurgerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\HttpCache; +namespace ApiPlatform\Tests\HttpCache; -use ApiPlatform\Core\HttpCache\VarnishPurger; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\HttpCache\VarnishPurger; use GuzzleHttp\ClientInterface; use GuzzleHttp\Promise\PromiseInterface; use GuzzleHttp\Psr7\Response; diff --git a/tests/Core/HttpCache/VarnishXKeyPurgerTest.php b/tests/HttpCache/VarnishXKeyPurgerTest.php similarity index 98% rename from tests/Core/HttpCache/VarnishXKeyPurgerTest.php rename to tests/HttpCache/VarnishXKeyPurgerTest.php index 89fdb5f2352..14b49b62f74 100644 --- a/tests/Core/HttpCache/VarnishXKeyPurgerTest.php +++ b/tests/HttpCache/VarnishXKeyPurgerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\HttpCache; +namespace ApiPlatform\Tests\HttpCache; -use ApiPlatform\Core\HttpCache\VarnishXKeyPurger; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\HttpCache\VarnishXKeyPurger; use GuzzleHttp\ClientInterface; use GuzzleHttp\Promise\PromiseInterface; use GuzzleHttp\Psr7\Response; diff --git a/tests/Core/Hydra/EventListener/AddLinkHeaderListenerTest.php b/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php similarity index 95% rename from tests/Core/Hydra/EventListener/AddLinkHeaderListenerTest.php rename to tests/Hydra/EventListener/AddLinkHeaderListenerTest.php index f62f24e5ddd..977305d4698 100644 --- a/tests/Core/Hydra/EventListener/AddLinkHeaderListenerTest.php +++ b/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\EventListener; +namespace ApiPlatform\Tests\Hydra\EventListener; use ApiPlatform\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Hydra\EventListener\AddLinkHeaderListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hydra\EventListener\AddLinkHeaderListener; use Fig\Link\GenericLinkProvider; use Fig\Link\Link; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Hydra/JsonSchema/SchemaFactoryTest.php b/tests/Hydra/JsonSchema/SchemaFactoryTest.php similarity index 95% rename from tests/Core/Hydra/JsonSchema/SchemaFactoryTest.php rename to tests/Hydra/JsonSchema/SchemaFactoryTest.php index d1626aed920..e2b6939a755 100644 --- a/tests/Core/Hydra/JsonSchema/SchemaFactoryTest.php +++ b/tests/Hydra/JsonSchema/SchemaFactoryTest.php @@ -11,20 +11,20 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\JsonSchema; +namespace ApiPlatform\Tests\Hydra\JsonSchema; use ApiPlatform\Core\Api\OperationType; -use ApiPlatform\Core\Hydra\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonLd\ContextBuilder; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactory as BaseSchemaFactory; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hydra\JsonSchema\SchemaFactory; +use ApiPlatform\JsonLd\ContextBuilder; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactory as BaseSchemaFactory; +use ApiPlatform\JsonSchema\TypeFactoryInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Hydra/Serializer/CollectionFiltersNormalizerTest.php b/tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php similarity index 98% rename from tests/Core/Hydra/Serializer/CollectionFiltersNormalizerTest.php rename to tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php index ce667aa233b..51c00ecd076 100644 --- a/tests/Core/Hydra/Serializer/CollectionFiltersNormalizerTest.php +++ b/tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php @@ -11,18 +11,18 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\Serializer; +namespace ApiPlatform\Tests\Hydra\Serializer; use ApiPlatform\Core\Api\FilterCollection; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\FilterInterface; -use ApiPlatform\Core\Hydra\Serializer\CollectionFiltersNormalizer; -use ApiPlatform\Core\Hydra\Serializer\CollectionNormalizer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Filter\FilterInterface; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Hydra\Serializer\CollectionFiltersNormalizer; +use ApiPlatform\Hydra\Serializer\CollectionNormalizer; use ApiPlatform\Tests\Fixtures\Foo; use ApiPlatform\Tests\Fixtures\NotAResource; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/Hydra/Serializer/CollectionNormalizerTest.php b/tests/Hydra/Serializer/CollectionNormalizerTest.php similarity index 98% rename from tests/Core/Hydra/Serializer/CollectionNormalizerTest.php rename to tests/Hydra/Serializer/CollectionNormalizerTest.php index a9b7625b6e5..2e6632b6e56 100644 --- a/tests/Core/Hydra/Serializer/CollectionNormalizerTest.php +++ b/tests/Hydra/Serializer/CollectionNormalizerTest.php @@ -11,18 +11,18 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\Serializer; +namespace ApiPlatform\Tests\Hydra\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; -use ApiPlatform\Core\Hydra\Serializer\CollectionNormalizer; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Hydra\Serializer\CollectionNormalizer; +use ApiPlatform\JsonLd\ContextBuilderInterface; +use ApiPlatform\Serializer\AbstractItemNormalizer; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use ApiPlatform\Tests\Fixtures\Foo; use ApiPlatform\Tests\Fixtures\NotAResource; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Hydra/Serializer/ConstraintViolationNormalizerTest.php b/tests/Hydra/Serializer/ConstraintViolationNormalizerTest.php similarity index 96% rename from tests/Core/Hydra/Serializer/ConstraintViolationNormalizerTest.php rename to tests/Hydra/Serializer/ConstraintViolationNormalizerTest.php index 2ad2080c01b..d60356561b7 100644 --- a/tests/Core/Hydra/Serializer/ConstraintViolationNormalizerTest.php +++ b/tests/Hydra/Serializer/ConstraintViolationNormalizerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\Serializer; +namespace ApiPlatform\Tests\Hydra\Serializer; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Hydra\Serializer\ConstraintViolationListNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hydra\Serializer\ConstraintViolationListNormalizer; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; diff --git a/tests/Core/Hydra/Serializer/DocumentationNormalizerTest.php b/tests/Hydra/Serializer/DocumentationNormalizerTest.php similarity index 99% rename from tests/Core/Hydra/Serializer/DocumentationNormalizerTest.php rename to tests/Hydra/Serializer/DocumentationNormalizerTest.php index a9237cfd2ac..3635da66d30 100644 --- a/tests/Core/Hydra/Serializer/DocumentationNormalizerTest.php +++ b/tests/Hydra/Serializer/DocumentationNormalizerTest.php @@ -11,13 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\Serializer; +namespace ApiPlatform\Tests\Hydra\Serializer; use ApiPlatform\Core\Api\OperationMethodResolverInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Documentation\Documentation; -use ApiPlatform\Core\Hydra\Serializer\DocumentationNormalizer; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; @@ -27,6 +25,8 @@ use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\Documentation; +use ApiPlatform\Hydra\Serializer\DocumentationNormalizer; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Get; diff --git a/tests/Core/Hydra/Serializer/EntrypointNormalizerTest.php b/tests/Hydra/Serializer/EntrypointNormalizerTest.php similarity index 98% rename from tests/Core/Hydra/Serializer/EntrypointNormalizerTest.php rename to tests/Hydra/Serializer/EntrypointNormalizerTest.php index 61df9a0dd9c..2f6c0da70a1 100644 --- a/tests/Core/Hydra/Serializer/EntrypointNormalizerTest.php +++ b/tests/Hydra/Serializer/EntrypointNormalizerTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\Serializer; +namespace ApiPlatform\Tests\Hydra\Serializer; use ApiPlatform\Core\Api\Entrypoint; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Hydra\Serializer\EntrypointNormalizer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hydra\Serializer\EntrypointNormalizer; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Get; use ApiPlatform\Metadata\Operations; diff --git a/tests/Core/Hydra/Serializer/ErrorNormalizerTest.php b/tests/Hydra/Serializer/ErrorNormalizerTest.php similarity index 97% rename from tests/Core/Hydra/Serializer/ErrorNormalizerTest.php rename to tests/Hydra/Serializer/ErrorNormalizerTest.php index 5cf6cdaa13a..ffc73cb3efd 100644 --- a/tests/Core/Hydra/Serializer/ErrorNormalizerTest.php +++ b/tests/Hydra/Serializer/ErrorNormalizerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\Serializer; +namespace ApiPlatform\Tests\Hydra\Serializer; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Hydra\Serializer\ErrorNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hydra\Serializer\ErrorNormalizer; use PHPUnit\Framework\TestCase; use Symfony\Component\Debug\Exception\FlattenException; use Symfony\Component\HttpFoundation\Response; diff --git a/tests/Core/Hydra/Serializer/PartialCollectionViewNormalizerTest.php b/tests/Hydra/Serializer/PartialCollectionViewNormalizerTest.php similarity index 97% rename from tests/Core/Hydra/Serializer/PartialCollectionViewNormalizerTest.php rename to tests/Hydra/Serializer/PartialCollectionViewNormalizerTest.php index a695146c5db..c1b999b9365 100644 --- a/tests/Core/Hydra/Serializer/PartialCollectionViewNormalizerTest.php +++ b/tests/Hydra/Serializer/PartialCollectionViewNormalizerTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Hydra\Serializer; +namespace ApiPlatform\Tests\Hydra\Serializer; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; -use ApiPlatform\Core\Hydra\Serializer\PartialCollectionViewNormalizer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Hydra\Serializer\PartialCollectionViewNormalizer; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\SoMany; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/JsonApi/Serializer/CollectionNormalizerTest.php b/tests/JsonApi/Serializer/CollectionNormalizerTest.php similarity index 98% rename from tests/Core/JsonApi/Serializer/CollectionNormalizerTest.php rename to tests/JsonApi/Serializer/CollectionNormalizerTest.php index c9c48bb6750..8bd3ad729dc 100644 --- a/tests/Core/JsonApi/Serializer/CollectionNormalizerTest.php +++ b/tests/JsonApi/Serializer/CollectionNormalizerTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\Serializer; +namespace ApiPlatform\Tests\JsonApi\Serializer; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\DataProvider\PaginatorInterface; -use ApiPlatform\Core\DataProvider\PartialPaginatorInterface; -use ApiPlatform\Core\JsonApi\Serializer\CollectionNormalizer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonApi\Serializer\CollectionNormalizer; +use ApiPlatform\State\Pagination\PaginatorInterface; +use ApiPlatform\State\Pagination\PartialPaginatorInterface; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Exception\UnexpectedValueException; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/tests/Core/JsonApi/Serializer/ConstraintViolationNormalizerTest.php b/tests/JsonApi/Serializer/ConstraintViolationNormalizerTest.php similarity index 97% rename from tests/Core/JsonApi/Serializer/ConstraintViolationNormalizerTest.php rename to tests/JsonApi/Serializer/ConstraintViolationNormalizerTest.php index 31ab59005cb..19913dd6799 100644 --- a/tests/Core/JsonApi/Serializer/ConstraintViolationNormalizerTest.php +++ b/tests/JsonApi/Serializer/ConstraintViolationNormalizerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\Serializer; +namespace ApiPlatform\Tests\JsonApi\Serializer; -use ApiPlatform\Core\JsonApi\Serializer\ConstraintViolationListNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonApi\Serializer\ConstraintViolationListNormalizer; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/JsonApi/Serializer/EntrypointNormalizerTest.php b/tests/JsonApi/Serializer/EntrypointNormalizerTest.php similarity index 97% rename from tests/Core/JsonApi/Serializer/EntrypointNormalizerTest.php rename to tests/JsonApi/Serializer/EntrypointNormalizerTest.php index c5672dc8f14..8cd803bf67c 100644 --- a/tests/Core/JsonApi/Serializer/EntrypointNormalizerTest.php +++ b/tests/JsonApi/Serializer/EntrypointNormalizerTest.php @@ -11,17 +11,17 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\Serializer; +namespace ApiPlatform\Tests\JsonApi\Serializer; use ApiPlatform\Core\Api\Entrypoint; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\JsonApi\Serializer\EntrypointNormalizer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\JsonApi\Serializer\EntrypointNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyCar; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy; diff --git a/tests/Core/JsonApi/Serializer/ErrorNormalizerTest.php b/tests/JsonApi/Serializer/ErrorNormalizerTest.php similarity index 97% rename from tests/Core/JsonApi/Serializer/ErrorNormalizerTest.php rename to tests/JsonApi/Serializer/ErrorNormalizerTest.php index dc9e68b4420..1803bd75e9d 100644 --- a/tests/Core/JsonApi/Serializer/ErrorNormalizerTest.php +++ b/tests/JsonApi/Serializer/ErrorNormalizerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\Serializer; +namespace ApiPlatform\Tests\JsonApi\Serializer; -use ApiPlatform\Core\JsonApi\Serializer\ErrorNormalizer; use ApiPlatform\Core\Tests\Mock\Exception\ErrorCodeSerializable; +use ApiPlatform\JsonApi\Serializer\ErrorNormalizer; use PHPUnit\Framework\TestCase; use Symfony\Component\Debug\Exception\FlattenException; use Symfony\Component\HttpFoundation\Response; diff --git a/tests/Core/JsonApi/Serializer/ItemNormalizerTest.php b/tests/JsonApi/Serializer/ItemNormalizerTest.php similarity index 99% rename from tests/Core/JsonApi/Serializer/ItemNormalizerTest.php rename to tests/JsonApi/Serializer/ItemNormalizerTest.php index 3486d6e247d..2b423b8e7e2 100644 --- a/tests/Core/JsonApi/Serializer/ItemNormalizerTest.php +++ b/tests/JsonApi/Serializer/ItemNormalizerTest.php @@ -11,12 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\Serializer; +namespace ApiPlatform\Tests\JsonApi\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\JsonApi\Serializer\ItemNormalizer; -use ApiPlatform\Core\JsonApi\Serializer\ReservedAttributeNameConverter; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; @@ -26,6 +24,8 @@ use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\ResourceClassNotFoundException; +use ApiPlatform\JsonApi\Serializer\ItemNormalizer; +use ApiPlatform\JsonApi\Serializer\ReservedAttributeNameConverter; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CircularReference; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/JsonApi/Serializer/ReservedAttributeNameConverterTest.php b/tests/JsonApi/Serializer/ReservedAttributeNameConverterTest.php similarity index 93% rename from tests/Core/JsonApi/Serializer/ReservedAttributeNameConverterTest.php rename to tests/JsonApi/Serializer/ReservedAttributeNameConverterTest.php index 6d1fd9d547f..6279e77db19 100644 --- a/tests/Core/JsonApi/Serializer/ReservedAttributeNameConverterTest.php +++ b/tests/JsonApi/Serializer/ReservedAttributeNameConverterTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\Serializer; +namespace ApiPlatform\Tests\JsonApi\Serializer; -use ApiPlatform\Core\JsonApi\Serializer\ReservedAttributeNameConverter; +use ApiPlatform\JsonApi\Serializer\ReservedAttributeNameConverter; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/JsonLd/Action/ContextActionTest.php b/tests/JsonLd/Action/ContextActionTest.php similarity index 96% rename from tests/Core/JsonLd/Action/ContextActionTest.php rename to tests/JsonLd/Action/ContextActionTest.php index 70dfce9f660..14a5a073f29 100644 --- a/tests/Core/JsonLd/Action/ContextActionTest.php +++ b/tests/JsonLd/Action/ContextActionTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonLd\Action; +namespace ApiPlatform\Tests\JsonLd\Action; -use ApiPlatform\Core\JsonLd\Action\ContextAction; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonLd\Action\ContextAction; +use ApiPlatform\JsonLd\ContextBuilderInterface; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/tests/Core/JsonLd/ContextBuilderTest.php b/tests/JsonLd/ContextBuilderTest.php similarity index 99% rename from tests/Core/JsonLd/ContextBuilderTest.php rename to tests/JsonLd/ContextBuilderTest.php index eb52495ae89..dc4605eed3f 100644 --- a/tests/Core/JsonLd/ContextBuilderTest.php +++ b/tests/JsonLd/ContextBuilderTest.php @@ -11,10 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonLd; +namespace ApiPlatform\Tests\JsonLd; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\JsonLd\ContextBuilder; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; @@ -23,6 +22,7 @@ use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonLd\ContextBuilder; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/JsonLd/Serializer/ItemNormalizerTest.php b/tests/JsonLd/Serializer/ItemNormalizerTest.php similarity index 97% rename from tests/Core/JsonLd/Serializer/ItemNormalizerTest.php rename to tests/JsonLd/Serializer/ItemNormalizerTest.php index 18d216de7a4..44611fa191f 100644 --- a/tests/Core/JsonLd/Serializer/ItemNormalizerTest.php +++ b/tests/JsonLd/Serializer/ItemNormalizerTest.php @@ -11,18 +11,18 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonLd\Serializer; +namespace ApiPlatform\Tests\JsonLd\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\JsonLd\ContextBuilderInterface; -use ApiPlatform\Core\JsonLd\Serializer\ItemNormalizer; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonLd\ContextBuilderInterface; +use ApiPlatform\JsonLd\Serializer\ItemNormalizer; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/JsonLd/Serializer/ObjectNormalizerTest.php b/tests/JsonLd/Serializer/ObjectNormalizerTest.php similarity index 97% rename from tests/Core/JsonLd/Serializer/ObjectNormalizerTest.php rename to tests/JsonLd/Serializer/ObjectNormalizerTest.php index 857ed3a0bcb..9d242e29c00 100644 --- a/tests/Core/JsonLd/Serializer/ObjectNormalizerTest.php +++ b/tests/JsonLd/Serializer/ObjectNormalizerTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonLd\Serializer; +namespace ApiPlatform\Tests\JsonLd\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; -use ApiPlatform\Core\JsonLd\AnonymousContextBuilderInterface; -use ApiPlatform\Core\JsonLd\Serializer\ObjectNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonLd\AnonymousContextBuilderInterface; +use ApiPlatform\JsonLd\Serializer\ObjectNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/JsonSchema/Command/JsonSchemaGenerateCommandTest.php b/tests/JsonSchema/Command/JsonSchemaGenerateCommandTest.php similarity index 98% rename from tests/Core/JsonSchema/Command/JsonSchemaGenerateCommandTest.php rename to tests/JsonSchema/Command/JsonSchemaGenerateCommandTest.php index c1a0df9c5c0..e266d0bb9fa 100644 --- a/tests/Core/JsonSchema/Command/JsonSchemaGenerateCommandTest.php +++ b/tests/JsonSchema/Command/JsonSchemaGenerateCommandTest.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonSchema\Command; +namespace ApiPlatform\Tests\JsonSchema\Command; use ApiPlatform\Tests\Fixtures\TestBundle\Document\Dummy as DocumentDummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/JsonSchema/SchemaFactoryTest.php b/tests/JsonSchema/SchemaFactoryTest.php similarity index 98% rename from tests/Core/JsonSchema/SchemaFactoryTest.php rename to tests/JsonSchema/SchemaFactoryTest.php index 41933b3603d..77dc9465389 100644 --- a/tests/Core/JsonSchema/SchemaFactoryTest.php +++ b/tests/JsonSchema/SchemaFactoryTest.php @@ -11,19 +11,19 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonSchema; +namespace ApiPlatform\Tests\JsonSchema; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactory; +use ApiPlatform\JsonSchema\TypeFactoryInterface; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Tests\Fixtures\NotAResource; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\OverriddenOperationDummy; diff --git a/tests/Core/JsonSchema/SchemaTest.php b/tests/JsonSchema/SchemaTest.php similarity index 97% rename from tests/Core/JsonSchema/SchemaTest.php rename to tests/JsonSchema/SchemaTest.php index 2827c226c34..f154b319061 100644 --- a/tests/Core/JsonSchema/SchemaTest.php +++ b/tests/JsonSchema/SchemaTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonSchema; +namespace ApiPlatform\Tests\JsonSchema; -use ApiPlatform\Core\JsonSchema\Schema; +use ApiPlatform\JsonSchema\Schema; use PHPUnit\Framework\TestCase; class SchemaTest extends TestCase diff --git a/tests/Core/JsonSchema/TypeFactoryTest.php b/tests/JsonSchema/TypeFactoryTest.php similarity index 98% rename from tests/Core/JsonSchema/TypeFactoryTest.php rename to tests/JsonSchema/TypeFactoryTest.php index dd608a0df27..0acbf44fb4b 100644 --- a/tests/Core/JsonSchema/TypeFactoryTest.php +++ b/tests/JsonSchema/TypeFactoryTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonSchema; +namespace ApiPlatform\Tests\JsonSchema; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; -use ApiPlatform\Core\JsonSchema\TypeFactory; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\TypeFactory; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyNameCollectionFactoryTest.php b/tests/Metadata/Property/PropertyInfoPropertyNameCollectionFactoryTest.php similarity index 95% rename from tests/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyNameCollectionFactoryTest.php rename to tests/Metadata/Property/PropertyInfoPropertyNameCollectionFactoryTest.php index 2371ec630e0..1f1d354e887 100644 --- a/tests/Core/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyNameCollectionFactoryTest.php +++ b/tests/Metadata/Property/PropertyInfoPropertyNameCollectionFactoryTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\PropertyInfo\Metadata\Property; +namespace ApiPlatform\Tests\Metadata\Property; -use ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyNameCollectionFactory; +use ApiPlatform\Metadata\Property\PropertyInfoPropertyNameCollectionFactory; use ApiPlatform\Tests\Fixtures\DummyIgnoreProperty; use ApiPlatform\Tests\Fixtures\DummyObjectWithOnlyPrivateProperty; use ApiPlatform\Tests\Fixtures\DummyObjectWithOnlyPublicProperty; diff --git a/tests/OpenApi/Factory/OpenApiFactoryTest.php b/tests/OpenApi/Factory/OpenApiFactoryTest.php index 5fe6a5da4cf..2d1ad3c802d 100644 --- a/tests/OpenApi/Factory/OpenApiFactoryTest.php +++ b/tests/OpenApi/Factory/OpenApiFactoryTest.php @@ -13,20 +13,13 @@ namespace ApiPlatform\Tests\OpenApi\Factory; -use ApiPlatform\Core\DataProvider\PaginationOptions; -use ApiPlatform\Core\JsonSchema\Schema; -use ApiPlatform\Core\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonSchema\TypeFactory; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; -use ApiPlatform\Core\OpenApi\Model; -use ApiPlatform\Core\OpenApi\Model\ExternalDocumentation; -use ApiPlatform\Core\OpenApi\OpenApi; -use ApiPlatform\Core\OpenApi\Options; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolver; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonSchema\Schema; +use ApiPlatform\JsonSchema\SchemaFactory; +use ApiPlatform\JsonSchema\TypeFactory; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Delete; @@ -43,6 +36,13 @@ use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; use ApiPlatform\Metadata\UriVariable; use ApiPlatform\OpenApi\Factory\OpenApiFactory; +use ApiPlatform\OpenApi\Model; +use ApiPlatform\OpenApi\Model\ExternalDocumentation; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\OpenApi\Options; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; +use ApiPlatform\State\Pagination\PaginationOptions; use ApiPlatform\Tests\Fixtures\DummyFilter; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/OpenApi/Model/SchemaTest.php b/tests/OpenApi/Model/SchemaTest.php index 0384d9e30c4..49ded2f8597 100644 --- a/tests/OpenApi/Model/SchemaTest.php +++ b/tests/OpenApi/Model/SchemaTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\OpenApi\Model; +namespace ApiPlatform\Tests\OpenApi\Model; -use ApiPlatform\Core\OpenApi\Model\Schema; +use ApiPlatform\OpenApi\Model\Schema; use PHPUnit\Framework\TestCase; use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait; diff --git a/tests/Core/Swagger/Serializer/ApiGatewayNormalizerTest.php b/tests/OpenApi/Serializer/ApiGatewayNormalizerTest.php similarity index 99% rename from tests/Core/Swagger/Serializer/ApiGatewayNormalizerTest.php rename to tests/OpenApi/Serializer/ApiGatewayNormalizerTest.php index 73ca72d2c0c..77949011b64 100644 --- a/tests/Core/Swagger/Serializer/ApiGatewayNormalizerTest.php +++ b/tests/OpenApi/Serializer/ApiGatewayNormalizerTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Swagger\Serializer; +namespace ApiPlatform\Tests\OpenApi\Serializer; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; -use ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\Documentation; +use ApiPlatform\OpenApi\Serializer\ApiGatewayNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; diff --git a/tests/Core/OpenApi/Serializer/OpenApiNormalizerTest.php b/tests/OpenApi/Serializer/OpenApiNormalizerTest.php similarity index 97% rename from tests/Core/OpenApi/Serializer/OpenApiNormalizerTest.php rename to tests/OpenApi/Serializer/OpenApiNormalizerTest.php index 15c5ebcd5fd..407652518d0 100644 --- a/tests/Core/OpenApi/Serializer/OpenApiNormalizerTest.php +++ b/tests/OpenApi/Serializer/OpenApiNormalizerTest.php @@ -11,12 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\OpenApi\Serializer; +namespace ApiPlatform\Tests\OpenApi\Serializer; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; -use ApiPlatform\Core\DataProvider\PaginationOptions; -use ApiPlatform\Core\JsonSchema\SchemaFactory; -use ApiPlatform\Core\JsonSchema\TypeFactory; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; @@ -26,15 +23,11 @@ use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\OpenApi\Factory\OpenApiFactory as LegacyOpenApiFactory; -use ApiPlatform\Core\OpenApi\Model; -use ApiPlatform\Core\OpenApi\OpenApi; -use ApiPlatform\Core\OpenApi\Options; -use ApiPlatform\Core\OpenApi\Serializer\OpenApiNormalizer; use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolver; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\JsonSchema\SchemaFactory; +use ApiPlatform\JsonSchema\TypeFactory; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Delete; use ApiPlatform\Metadata\Get; @@ -46,6 +39,13 @@ use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; use ApiPlatform\OpenApi\Factory\OpenApiFactory; +use ApiPlatform\OpenApi\Model; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\OpenApi\Options; +use ApiPlatform\OpenApi\Serializer\OpenApiNormalizer; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; +use ApiPlatform\State\Pagination\PaginationOptions; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/PathResolver/CustomOperationPathResolverTest.php b/tests/PathResolver/CustomOperationPathResolverTest.php similarity index 82% rename from tests/Core/PathResolver/CustomOperationPathResolverTest.php rename to tests/PathResolver/CustomOperationPathResolverTest.php index 0a5a3f9af9d..55d9d2783f9 100644 --- a/tests/Core/PathResolver/CustomOperationPathResolverTest.php +++ b/tests/PathResolver/CustomOperationPathResolverTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\PathResolver; +namespace ApiPlatform\Tests\PathResolver; use ApiPlatform\Core\Api\OperationType; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolverInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolverInterface; use PHPUnit\Framework\TestCase; /** @@ -45,7 +45,7 @@ public function testResolveOperationPathWithDeferred() /** * @group legacy - * @expectedDeprecation Method ApiPlatform\Core\PathResolver\CustomOperationPathResolver::resolveOperationPath() will have a 4th `string $operationName` argument in version 3.0. Not defining it is deprecated since 2.1. + * @expectedDeprecation Method ApiPlatform\PathResolver\CustomOperationPathResolver::resolveOperationPath() will have a 4th `string $operationName` argument in version 3.0. Not defining it is deprecated since 2.1. */ public function testLegacyResolveOperationPath() { diff --git a/tests/Core/PathResolver/OperationPathResolverTest.php b/tests/PathResolver/OperationPathResolverTest.php similarity index 91% rename from tests/Core/PathResolver/OperationPathResolverTest.php rename to tests/PathResolver/OperationPathResolverTest.php index 81c9b77f38f..c70b5e9abcb 100644 --- a/tests/Core/PathResolver/OperationPathResolverTest.php +++ b/tests/PathResolver/OperationPathResolverTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\PathResolver; +namespace ApiPlatform\Tests\PathResolver; use ApiPlatform\Core\Api\OperationType; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\OperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; use PHPUnit\Framework\TestCase; class OperationPathResolverTest extends TestCase diff --git a/tests/Core/Problem/Serializer/ConstraintViolationNormalizerTest.php b/tests/Problem/Serializer/ConstraintViolationNormalizerTest.php similarity index 95% rename from tests/Core/Problem/Serializer/ConstraintViolationNormalizerTest.php rename to tests/Problem/Serializer/ConstraintViolationNormalizerTest.php index ea4cf3baf99..8bc6adc5fd3 100644 --- a/tests/Core/Problem/Serializer/ConstraintViolationNormalizerTest.php +++ b/tests/Problem/Serializer/ConstraintViolationNormalizerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Problem\Serializer; +namespace ApiPlatform\Tests\Problem\Serializer; -use ApiPlatform\Core\Problem\Serializer\ConstraintViolationListNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Problem\Serializer\ConstraintViolationListNormalizer; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; diff --git a/tests/Core/Problem/Serializer/ErrorNormalizerTest.php b/tests/Problem/Serializer/ErrorNormalizerTest.php similarity index 97% rename from tests/Core/Problem/Serializer/ErrorNormalizerTest.php rename to tests/Problem/Serializer/ErrorNormalizerTest.php index d9b1dc0c8d3..e0dd54f7034 100644 --- a/tests/Core/Problem/Serializer/ErrorNormalizerTest.php +++ b/tests/Problem/Serializer/ErrorNormalizerTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Problem\Serializer; +namespace ApiPlatform\Tests\Problem\Serializer; -use ApiPlatform\Core\Problem\Serializer\ErrorNormalizer; +use ApiPlatform\Problem\Serializer\ErrorNormalizer; use PHPUnit\Framework\TestCase; use Symfony\Component\Debug\Exception\FlattenException; use Symfony\Component\HttpFoundation\Response; diff --git a/tests/Core/Bridge/RamseyUuid/Serializer/UuidDenormalizerTest.php b/tests/RamseyUuid/Serializer/UuidDenormalizerTest.php similarity index 91% rename from tests/Core/Bridge/RamseyUuid/Serializer/UuidDenormalizerTest.php rename to tests/RamseyUuid/Serializer/UuidDenormalizerTest.php index 1525c624389..9d7be7f85b8 100644 --- a/tests/Core/Bridge/RamseyUuid/Serializer/UuidDenormalizerTest.php +++ b/tests/RamseyUuid/Serializer/UuidDenormalizerTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\RamseyUuid\Serializer; +namespace ApiPlatform\Tests\RamseyUuid\Serializer; -use ApiPlatform\Core\Bridge\RamseyUuid\Serializer\UuidDenormalizer; +use ApiPlatform\RamseyUuid\Serializer\UuidDenormalizer; use PHPUnit\Framework\TestCase; use Ramsey\Uuid\Uuid; use Symfony\Component\Serializer\Exception\NotNormalizableValueException; diff --git a/tests/Core/Serializer/AbstractItemNormalizerTest.php b/tests/Serializer/AbstractItemNormalizerTest.php similarity index 99% rename from tests/Core/Serializer/AbstractItemNormalizerTest.php rename to tests/Serializer/AbstractItemNormalizerTest.php index 2db10e51cc0..24e979b9f35 100644 --- a/tests/Core/Serializer/AbstractItemNormalizerTest.php +++ b/tests/Serializer/AbstractItemNormalizerTest.php @@ -11,25 +11,25 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer; +namespace ApiPlatform\Tests\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyMetadata; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; -use ApiPlatform\Core\Serializer\AbstractItemNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\DataTransformer\DataTransformerInitializerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Exception\ItemNotFoundException; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Serializer\AbstractItemNormalizer; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\InputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyForAdditionalFields; diff --git a/tests/Core/Serializer/Filter/GroupFilterTest.php b/tests/Serializer/Filter/GroupFilterTest.php similarity index 97% rename from tests/Core/Serializer/Filter/GroupFilterTest.php rename to tests/Serializer/Filter/GroupFilterTest.php index 1dfa6a4a7b2..34fd070c0ef 100644 --- a/tests/Core/Serializer/Filter/GroupFilterTest.php +++ b/tests/Serializer/Filter/GroupFilterTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer\Filter; +namespace ApiPlatform\Tests\Serializer\Filter; -use ApiPlatform\Core\Serializer\Filter\GroupFilter; +use ApiPlatform\Serializer\Filter\GroupFilter; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyGroup; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/Serializer/Filter/PropertyFilterTest.php b/tests/Serializer/Filter/PropertyFilterTest.php similarity index 98% rename from tests/Core/Serializer/Filter/PropertyFilterTest.php rename to tests/Serializer/Filter/PropertyFilterTest.php index 3d0c55db3cc..f854e70e75f 100644 --- a/tests/Core/Serializer/Filter/PropertyFilterTest.php +++ b/tests/Serializer/Filter/PropertyFilterTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer\Filter; +namespace ApiPlatform\Tests\Serializer\Filter; -use ApiPlatform\Core\Serializer\Filter\PropertyFilter; +use ApiPlatform\Serializer\Filter\PropertyFilter; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyProperty; use ApiPlatform\Tests\Fixtures\TestBundle\Serializer\NameConverter\CustomConverter; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Serializer/ItemNormalizerTest.php b/tests/Serializer/ItemNormalizerTest.php similarity index 98% rename from tests/Core/Serializer/ItemNormalizerTest.php rename to tests/Serializer/ItemNormalizerTest.php index ede88e6cb16..a7c50d43308 100644 --- a/tests/Core/Serializer/ItemNormalizerTest.php +++ b/tests/Serializer/ItemNormalizerTest.php @@ -11,18 +11,18 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer; +namespace ApiPlatform\Tests\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; -use ApiPlatform\Core\Serializer\ItemNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\DataTransformer\DataTransformerInterface; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Serializer\ItemNormalizer; use ApiPlatform\Tests\Fixtures\TestBundle\Dto\OutputDto; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Serializer/JsonEncoderTest.php b/tests/Serializer/JsonEncoderTest.php similarity index 93% rename from tests/Core/Serializer/JsonEncoderTest.php rename to tests/Serializer/JsonEncoderTest.php index 8ed79a789b6..a4138b3fffd 100644 --- a/tests/Core/Serializer/JsonEncoderTest.php +++ b/tests/Serializer/JsonEncoderTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer; +namespace ApiPlatform\Tests\Serializer; -use ApiPlatform\Core\Serializer\JsonEncoder; +use ApiPlatform\Serializer\JsonEncoder; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Core/Serializer/LegacySerializerContextBuilderTest.php b/tests/Serializer/LegacySerializerContextBuilderTest.php similarity index 98% rename from tests/Core/Serializer/LegacySerializerContextBuilderTest.php rename to tests/Serializer/LegacySerializerContextBuilderTest.php index 2c72e2b20e1..dd0e95be199 100644 --- a/tests/Core/Serializer/LegacySerializerContextBuilderTest.php +++ b/tests/Serializer/LegacySerializerContextBuilderTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer; +namespace ApiPlatform\Tests\Serializer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\SerializerContextBuilder; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\RuntimeException; +use ApiPlatform\Serializer\SerializerContextBuilder; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/Serializer/ResourceListTest.php b/tests/Serializer/ResourceListTest.php similarity index 87% rename from tests/Core/Serializer/ResourceListTest.php rename to tests/Serializer/ResourceListTest.php index d0caba96bff..6a69d988886 100644 --- a/tests/Core/Serializer/ResourceListTest.php +++ b/tests/Serializer/ResourceListTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer; +namespace ApiPlatform\Tests\Serializer; -use ApiPlatform\Core\Serializer\ResourceList; +use ApiPlatform\Serializer\ResourceList; use PHPUnit\Framework\TestCase; class ResourceListTest extends TestCase diff --git a/tests/Core/Serializer/SerializerContextBuilderTest.php b/tests/Serializer/SerializerContextBuilderTest.php similarity index 98% rename from tests/Core/Serializer/SerializerContextBuilderTest.php rename to tests/Serializer/SerializerContextBuilderTest.php index 93d2eb55756..24926fb8a27 100644 --- a/tests/Core/Serializer/SerializerContextBuilderTest.php +++ b/tests/Serializer/SerializerContextBuilderTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer; +namespace ApiPlatform\Tests\Serializer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\SerializerContextBuilder; use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\RuntimeException; +use ApiPlatform\Serializer\SerializerContextBuilder; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/Serializer/SerializerFilterContextBuilderTest.php b/tests/Serializer/SerializerFilterContextBuilderTest.php similarity index 97% rename from tests/Core/Serializer/SerializerFilterContextBuilderTest.php rename to tests/Serializer/SerializerFilterContextBuilderTest.php index 969bed24aed..e19f6a16220 100644 --- a/tests/Core/Serializer/SerializerFilterContextBuilderTest.php +++ b/tests/Serializer/SerializerFilterContextBuilderTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Serializer; +namespace ApiPlatform\Tests\Serializer; use ApiPlatform\Core\Api\FilterInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\Filter\FilterInterface as SerializerFilterInterface; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; -use ApiPlatform\Core\Serializer\SerializerFilterContextBuilder; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\RuntimeException; +use ApiPlatform\Serializer\Filter\FilterInterface as SerializerFilterInterface; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; +use ApiPlatform\Serializer\SerializerFilterContextBuilder; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyGroup; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; diff --git a/tests/Core/DataProvider/ArrayPaginatorTest.php b/tests/State/Pagination/ArrayPaginatorTest.php similarity index 94% rename from tests/Core/DataProvider/ArrayPaginatorTest.php rename to tests/State/Pagination/ArrayPaginatorTest.php index f6029082359..612c66225e0 100644 --- a/tests/Core/DataProvider/ArrayPaginatorTest.php +++ b/tests/State/Pagination/ArrayPaginatorTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\DataProvider; +namespace ApiPlatform\Tests\State\Pagination; -use ApiPlatform\Core\DataProvider\ArrayPaginator; +use ApiPlatform\State\Pagination\ArrayPaginator; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Core/DataProvider/TraversablePaginatorTest.php b/tests/State/Pagination/TraversablePaginatorTest.php similarity index 94% rename from tests/Core/DataProvider/TraversablePaginatorTest.php rename to tests/State/Pagination/TraversablePaginatorTest.php index ac96262a102..5a1f635d960 100644 --- a/tests/Core/DataProvider/TraversablePaginatorTest.php +++ b/tests/State/Pagination/TraversablePaginatorTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\DataProvider; +namespace ApiPlatform\Tests\State\Pagination; -use ApiPlatform\Core\DataProvider\TraversablePaginator; +use ApiPlatform\State\Pagination\TraversablePaginator; use ArrayIterator; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Symfony/Bundle/Action/SwaggerUiActionTest.php b/tests/Symfony/Bundle/Action/SwaggerUiActionTest.php similarity index 96% rename from tests/Core/Bridge/Symfony/Bundle/Action/SwaggerUiActionTest.php rename to tests/Symfony/Bundle/Action/SwaggerUiActionTest.php index a128011c86d..bd543e66b37 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Action/SwaggerUiActionTest.php +++ b/tests/Symfony/Bundle/Action/SwaggerUiActionTest.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Action; +namespace ApiPlatform\Tests\Symfony\Bundle\Action; use ApiPlatform\Core\Bridge\Symfony\Bundle\Action\SwaggerUiAction; -use ApiPlatform\Core\Documentation\Documentation; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\Documentation; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait; @@ -52,7 +52,7 @@ class SwaggerUiActionTest extends TestCase */ public function testInvoke(Request $request, $twigProphecy) { - $this->expectDeprecation('The use of "ApiPlatform\Core\Bridge\Symfony\Bundle\Action\SwaggerUiAction" is deprecated since API Platform 2.6, use "ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiAction" instead.'); + $this->expectDeprecation('The use of "ApiPlatform\Core\Bridge\Symfony\Bundle\Action\SwaggerUiAction" is deprecated since API Platform 2.6, use "ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiAction" instead.'); $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class); $resourceNameCollectionFactoryProphecy->create()->willReturn(new ResourceNameCollection(['Foo', 'Bar']))->shouldBeCalled(); @@ -160,7 +160,7 @@ public function getInvokeParameters() */ public function testDoNotRunCurrentRequest(Request $request) { - $this->expectDeprecation('The use of "ApiPlatform\Core\Bridge\Symfony\Bundle\Action\SwaggerUiAction" is deprecated since API Platform 2.6, use "ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiAction" instead.'); + $this->expectDeprecation('The use of "ApiPlatform\Core\Bridge\Symfony\Bundle\Action\SwaggerUiAction" is deprecated since API Platform 2.6, use "ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiAction" instead.'); $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class); $resourceNameCollectionFactoryProphecy->create()->willReturn(new ResourceNameCollection(['Foo', 'Bar']))->shouldBeCalled(); diff --git a/tests/Core/Bridge/Symfony/Bundle/ApiPlatformBundleTest.php b/tests/Symfony/Bundle/ApiPlatformBundleTest.php similarity index 64% rename from tests/Core/Bridge/Symfony/Bundle/ApiPlatformBundleTest.php rename to tests/Symfony/Bundle/ApiPlatformBundleTest.php index ac043f594ba..b1318d15953 100644 --- a/tests/Core/Bridge/Symfony/Bundle/ApiPlatformBundleTest.php +++ b/tests/Symfony/Bundle/ApiPlatformBundleTest.php @@ -11,21 +11,21 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle; +namespace ApiPlatform\Tests\Symfony\Bundle; -use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\FilterPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\ApiPlatformBundle; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\FilterPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Compiler\PassConfig; diff --git a/tests/Core/Bridge/Symfony/Bundle/ArgumentResolver/NotResource.php b/tests/Symfony/Bundle/ArgumentResolver/NotResource.php similarity index 79% rename from tests/Core/Bridge/Symfony/Bundle/ArgumentResolver/NotResource.php rename to tests/Symfony/Bundle/ArgumentResolver/NotResource.php index 3337cab3913..8b0db1a7cd8 100644 --- a/tests/Core/Bridge/Symfony/Bundle/ArgumentResolver/NotResource.php +++ b/tests/Symfony/Bundle/ArgumentResolver/NotResource.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\ArgumentResolver; +namespace ApiPlatform\Tests\Symfony\Bundle\ArgumentResolver; class NotResource { diff --git a/tests/Core/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php b/tests/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php similarity index 97% rename from tests/Core/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php rename to tests/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php index b1ef78e1ec8..4b64320a7e2 100644 --- a/tests/Core/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php +++ b/tests/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php @@ -11,10 +11,8 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\ArgumentResolver; +namespace ApiPlatform\Tests\Symfony\Bundle\ArgumentResolver; -use ApiPlatform\Core\Bridge\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Operations; @@ -22,6 +20,8 @@ use ApiPlatform\Metadata\Put; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; +use ApiPlatform\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\ResourceImplementation; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\ResourceInterface; use Prophecy\Argument; diff --git a/tests/Bridge/Symfony/Bundle/Command/DebugResourceCommandTest.php b/tests/Symfony/Bundle/Command/DebugResourceCommandTest.php similarity index 98% rename from tests/Bridge/Symfony/Bundle/Command/DebugResourceCommandTest.php rename to tests/Symfony/Bundle/Command/DebugResourceCommandTest.php index 02a56cbf3df..09a0f859f60 100644 --- a/tests/Bridge/Symfony/Bundle/Command/DebugResourceCommandTest.php +++ b/tests/Symfony/Bundle/Command/DebugResourceCommandTest.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Symfony\Bundle\Command; +namespace ApiPlatform\Tests\Symfony\Bundle\Command; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\ResourceClassNotFoundException; diff --git a/tests/Core/Bridge/Symfony/Bundle/Command/OpenApiCommandTest.php b/tests/Symfony/Bundle/Command/OpenApiCommandTest.php similarity index 96% rename from tests/Core/Bridge/Symfony/Bundle/Command/OpenApiCommandTest.php rename to tests/Symfony/Bundle/Command/OpenApiCommandTest.php index 5d47b0fd9d2..fb5031223ec 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Command/OpenApiCommandTest.php +++ b/tests/Symfony/Bundle/Command/OpenApiCommandTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Command; +namespace ApiPlatform\Tests\Symfony\Bundle\Command; -use ApiPlatform\Core\OpenApi\OpenApi; +use ApiPlatform\OpenApi\OpenApi; use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Console\Tester\ApplicationTester; diff --git a/tests/Core/Bridge/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php b/tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php similarity index 98% rename from tests/Core/Bridge/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php rename to tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php index 9d28da2f85b..168382e63c9 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php +++ b/tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php @@ -11,9 +11,8 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DataCollector; +namespace ApiPlatform\Tests\Symfony\Bundle\DataCollector; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DataCollector\RequestDataCollector; use ApiPlatform\Core\Bridge\Symfony\Bundle\DataPersister\TraceableChainDataPersister; use ApiPlatform\Core\Bridge\Symfony\Bundle\DataProvider\TraceableChainCollectionDataProvider; use ApiPlatform\Core\Bridge\Symfony\Bundle\DataProvider\TraceableChainItemDataProvider; @@ -30,6 +29,7 @@ use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Symfony\Bundle\DataCollector\RequestDataCollector; use ApiPlatform\Tests\Fixtures\DummyEntity; use PackageVersions\Versions; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php similarity index 95% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php rename to tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php index bd5cf4ac1e7..a5eb69b89e5 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php @@ -11,77 +11,62 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection; +use ApiPlatform\Action\NotFoundAction; use ApiPlatform\Api\IdentifiersExtractorInterface; use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Action\NotFoundAction; use ApiPlatform\Core\Api\FilterInterface; use ApiPlatform\Core\Api\IdentifiersExtractorInterface as LegacyIdentifiersExtractorInterface; use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface; use ApiPlatform\Core\Api\OperationAwareFormatsProviderInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\AggregationItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\FilterExtension as MongoDbOdmFilterExtension; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\OrderExtension as MongoDbOdmOrderExtension; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension\PaginationExtension as MongoDbOdmPaginationExtension; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\AbstractFilter as DoctrineMongoDbOdmAbstractFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\BooleanFilter as MongoDbOdmBooleanFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\DateFilter as MongoDbOdmDateFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\ExistsFilter as MongoDbOdmExistsFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\NumericFilter as MongoDbOdmNumericFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\OrderFilter as MongoDbOdmOrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\RangeFilter as MongoDbOdmRangeFilter; -use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter as MongoDbOdmSearchFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\EagerLoadingExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\OrderExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter as DoctrineOrmAbstractContextAwareFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\ExistsFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\NumericFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\RangeFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; use ApiPlatform\Core\Bridge\Elasticsearch\Api\IdentifierExtractorInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Extension\RequestBodySearchCollectionExtensionInterface; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\MatchFilter; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\OrderFilter as ElasticsearchOrderFilter; -use ApiPlatform\Core\Bridge\Elasticsearch\DataProvider\Filter\TermFilter; -use ApiPlatform\Core\Bridge\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\ApiPlatformExtension; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface; -use ApiPlatform\Core\Bridge\Symfony\Validator\ValidationGroupsGeneratorInterface; use ApiPlatform\Core\DataPersister\DataPersisterInterface; use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; -use ApiPlatform\Core\DataProvider\Pagination; -use ApiPlatform\Core\DataProvider\PaginationOptions; use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInitializerInterface; -use ApiPlatform\Core\DataTransformer\DataTransformerInterface; -use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface; -use ApiPlatform\Core\JsonSchema\TypeFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface as LegacyPropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; -use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface; -use ApiPlatform\Core\OpenApi\Options; -use ApiPlatform\Core\OpenApi\Serializer\OpenApiNormalizer; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; -use ApiPlatform\Core\Serializer\Filter\GroupFilter; -use ApiPlatform\Core\Serializer\Filter\PropertyFilter; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Core\Tests\ProphecyTrait; -use ApiPlatform\Core\Validator\ValidatorInterface; +use ApiPlatform\DataTransformer\DataTransformerInitializerInterface; +use ApiPlatform\DataTransformer\DataTransformerInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationCollectionExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\AggregationItemExtensionInterface; +use ApiPlatform\Doctrine\Odm\Extension\FilterExtension as MongoDbOdmFilterExtension; +use ApiPlatform\Doctrine\Odm\Extension\OrderExtension as MongoDbOdmOrderExtension; +use ApiPlatform\Doctrine\Odm\Extension\PaginationExtension as MongoDbOdmPaginationExtension; +use ApiPlatform\Doctrine\Odm\Filter\AbstractFilter as DoctrineMongoDbOdmAbstractFilter; +use ApiPlatform\Doctrine\Odm\Filter\BooleanFilter as MongoDbOdmBooleanFilter; +use ApiPlatform\Doctrine\Odm\Filter\DateFilter as MongoDbOdmDateFilter; +use ApiPlatform\Doctrine\Odm\Filter\ExistsFilter as MongoDbOdmExistsFilter; +use ApiPlatform\Doctrine\Odm\Filter\NumericFilter as MongoDbOdmNumericFilter; +use ApiPlatform\Doctrine\Odm\Filter\OrderFilter as MongoDbOdmOrderFilter; +use ApiPlatform\Doctrine\Odm\Filter\RangeFilter as MongoDbOdmRangeFilter; +use ApiPlatform\Doctrine\Odm\Filter\SearchFilter as MongoDbOdmSearchFilter; +use ApiPlatform\Doctrine\Orm\Extension\EagerLoadingExtension; +use ApiPlatform\Doctrine\Orm\Extension\FilterEagerLoadingExtension; +use ApiPlatform\Doctrine\Orm\Extension\FilterExtension; +use ApiPlatform\Doctrine\Orm\Extension\OrderExtension; +use ApiPlatform\Doctrine\Orm\Extension\PaginationExtension; +use ApiPlatform\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; +use ApiPlatform\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Doctrine\Orm\Filter\AbstractContextAwareFilter as DoctrineOrmAbstractContextAwareFilter; +use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; +use ApiPlatform\Doctrine\Orm\Filter\DateFilter; +use ApiPlatform\Doctrine\Orm\Filter\ExistsFilter; +use ApiPlatform\Doctrine\Orm\Filter\NumericFilter; +use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Orm\Filter\RangeFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface; +use ApiPlatform\Elasticsearch\Filter\MatchFilter; +use ApiPlatform\Elasticsearch\Filter\OrderFilter as ElasticsearchOrderFilter; +use ApiPlatform\Elasticsearch\Filter\TermFilter; +use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface; use ApiPlatform\Exception\FilterValidationException; use ApiPlatform\Exception\InvalidArgumentException; use ApiPlatform\GraphQl\Error\ErrorHandlerInterface; @@ -90,11 +75,26 @@ use ApiPlatform\GraphQl\Resolver\QueryItemResolverInterface; use ApiPlatform\GraphQl\Serializer\SerializerContextBuilderInterface as GraphQlSerializerContextBuilderInterface; use ApiPlatform\GraphQl\Type\Definition\TypeInterface as GraphQlTypeInterface; +use ApiPlatform\JsonSchema\SchemaFactoryInterface; +use ApiPlatform\JsonSchema\TypeFactoryInterface; use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; +use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface; +use ApiPlatform\OpenApi\Options; +use ApiPlatform\OpenApi\Serializer\OpenApiNormalizer; +use ApiPlatform\Serializer\Filter\GroupFilter; +use ApiPlatform\Serializer\Filter\PropertyFilter; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; +use ApiPlatform\State\Pagination\Pagination; +use ApiPlatform\State\Pagination\PaginationOptions; use ApiPlatform\State\ProcessorInterface; use ApiPlatform\State\ProviderInterface; +use ApiPlatform\Symfony\Bundle\DependencyInjection\ApiPlatformExtension; +use ApiPlatform\Symfony\EventListener\ValidatorInterface; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface; +use ApiPlatform\Symfony\Validator\ValidationGroupsGeneratorInterface; use ApiPlatform\Tests\Fixtures\TestBundle\TestBundle; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; use Doctrine\ORM\OptimisticLockException; @@ -895,21 +895,20 @@ static function (string $path): string { ); }; - $testsDirectory = \dirname(__DIR__, 4); - $fixturesDirectory = \dirname($testsDirectory); + $testsDirectory = \dirname(__DIR__, 3); self::assertSame( $normalizePaths([ - "{$fixturesDirectory}/Fixtures/TestBundle/Resources/config/api_resources.yml", - "{$fixturesDirectory}/Fixtures/TestBundle/Resources/config/api_resources/dummy_address.yml", - "{$fixturesDirectory}/Fixtures/TestBundle/Resources/config/api_resources/my_resource.yml", - "{$testsDirectory}/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/B.yaml", - "{$testsDirectory}/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/Bb.yaml", - "{$testsDirectory}/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/a.yaml", - "{$testsDirectory}/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/a/a.yaml", - "{$testsDirectory}/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/b/a.yaml", - "{$testsDirectory}/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/c.yaml", - "{$testsDirectory}/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/c/a.yaml", + "{$testsDirectory}/Fixtures/TestBundle/Resources/config/api_resources.yml", + "{$testsDirectory}/Fixtures/TestBundle/Resources/config/api_resources/dummy_address.yml", + "{$testsDirectory}/Fixtures/TestBundle/Resources/config/api_resources/my_resource.yml", + "{$testsDirectory}/Symfony/Bundle/DependencyInjection/Fixtures/resources/B.yaml", + "{$testsDirectory}/Symfony/Bundle/DependencyInjection/Fixtures/resources/Bb.yaml", + "{$testsDirectory}/Symfony/Bundle/DependencyInjection/Fixtures/resources/a.yaml", + "{$testsDirectory}/Symfony/Bundle/DependencyInjection/Fixtures/resources/a/a.yaml", + "{$testsDirectory}/Symfony/Bundle/DependencyInjection/Fixtures/resources/b/a.yaml", + "{$testsDirectory}/Symfony/Bundle/DependencyInjection/Fixtures/resources/c.yaml", + "{$testsDirectory}/Symfony/Bundle/DependencyInjection/Fixtures/resources/c/a.yaml", ]), $normalizePaths($paths) ); @@ -965,7 +964,7 @@ private function getPartialContainerBuilderProphecy($configuration = null) $containerBuilderProphecy->getParameter('kernel.bundles_metadata')->willReturn([ 'TestBundle' => [ 'parent' => null, - 'path' => realpath(__DIR__.'/../../../../../Fixtures/TestBundle'), + 'path' => realpath(__DIR__.'/../../../Fixtures/TestBundle'), 'namespace' => TestBundle::class, ], ])->shouldBeCalled(); @@ -1225,7 +1224,7 @@ private function getPartialContainerBuilderProphecy($configuration = null) // echo "Alias: '{$args[0]}' => '{$args[1]}',".\PHP_EOL; // }); - $containerBuilderProphecy->getParameter('kernel.project_dir')->willReturn(__DIR__.'/../../../../../Fixtures/app'); + $containerBuilderProphecy->getParameter('kernel.project_dir')->willReturn(__DIR__.'/../../../Fixtures/app'); $containerBuilderProphecy->getParameter('kernel.debug')->willReturn(false); // irrelevant, but to prevent errors @@ -1240,6 +1239,9 @@ private function getPartialContainerBuilderProphecy($configuration = null) $containerBuilderProphecy->getAlias(Argument::type('string')) ->willReturn($this->prophesize(Alias::class)->reveal()); + //TODO: to remove in 3.0 + $this->addDeprecatedInterfacesToContainerBuilder($containerBuilderProphecy); + return $containerBuilderProphecy; } @@ -1716,4 +1718,19 @@ private function getFormatsFromConfiguration(array $formatsConfiguration) return $formats; } + + //TODO: to remove in 3.0 + private function addDeprecatedInterfacesToContainerBuilder($containerBuilderProphecy) + { + $deprecatedInterfaces = include __DIR__.'/../../../../src/deprecated_interfaces.php'; + foreach ($deprecatedInterfaces as $oldInterface => $newInterface) { + $containerBuilderProphecy->hasAlias($oldInterface)->shouldBeCalled()->willReturn(false); + $containerBuilderProphecy->hasAlias($newInterface)->shouldBeCalled()->willReturn(true); + $containerBuilderProphecy->setAlias($oldInterface, $newInterface)->shouldBeCalled(); + + $definitionProphecy = $this->prophesize(Definition::class); + $definitionProphecy->setDeprecated('api-platform/core', '2.7', Argument::type('string'))->shouldBeCalled(); + $containerBuilderProphecy->getDefinition($oldInterface)->shouldBeCalled()->willReturn($definitionProphecy->reveal()); + } + } } diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php similarity index 86% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php index 7b7838db799..813f2b7875a 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; use ApiPlatform\Core\Annotation\ApiFilter; use ApiPlatform\Core\Api\FilterInterface; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass; -use ApiPlatform\Core\Serializer\Filter\GroupFilter; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Doctrine\Orm\Filter\DateFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Serializer\Filter\GroupFilter; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Filter\DoesNotImplementInterfaceFilter; use ApiPlatform\Tests\Fixtures\TestBundle\Filter\NoConstructorFilter; @@ -72,14 +72,14 @@ public function testProcess(): void $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class); $containerBuilderProphecy->getParameter('api_platform.resource_class_directories')->willReturn([ - __DIR__.'/../../../../../../Fixtures/TestBundle/Entity/', + __DIR__.'/../../../../Fixtures/TestBundle/Entity/', ]); $containerBuilderProphecy->has('annotation_reader')->willReturn(true); $containerBuilderProphecy->get('annotation_reader')->willReturn($readerProphecy); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_bridge_doctrine_orm_filter_search_filter')->willReturn(false); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_serializer_filter_group_filter')->willReturn(false); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_bridge_doctrine_orm_filter_date_filter')->willReturn(false); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_core_bridge_doctrine_orm_filter_search_filter')->willReturn(false); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_doctrine_orm_filter_search_filter')->willReturn(false); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_serializer_filter_group_filter')->willReturn(false); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_doctrine_orm_filter_date_filter')->willReturn(false); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_doctrine_orm_filter_search_filter')->willReturn(false); $containerBuilderProphecy->has(SearchFilter::class)->willReturn(false); $containerBuilderProphecy->has(GroupFilter::class)->willReturn(false); $containerBuilderProphecy->has(DateFilter::class)->willReturn(true); @@ -87,26 +87,26 @@ public function testProcess(): void $containerBuilderProphecy->getReflectionClass(SearchFilter::class, false)->willReturn(new \ReflectionClass(SearchFilter::class)); $containerBuilderProphecy->getReflectionClass(GroupFilter::class, false)->willReturn(new \ReflectionClass(GroupFilter::class)); $containerBuilderProphecy->getReflectionClass(DateFilter::class, false)->willReturn(new \ReflectionClass(DateFilter::class)); - $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_bridge_doctrine_orm_filter_search_filter', Argument::allOf( + $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_doctrine_orm_filter_search_filter', Argument::allOf( Argument::type(Definition::class), Argument::that(function (Definition $definition): bool { return SearchFilter::class === $definition->getClass() && ['$properties' => ['description' => null, 'relatedDummy.name' => null, 'name' => null]] === $definition->getArguments(); }) ))->shouldBeCalled(); - $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_serializer_filter_group_filter', Argument::allOf( + $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_serializer_filter_group_filter', Argument::allOf( Argument::type(Definition::class), Argument::that(function (Definition $definition): bool { return GroupFilter::class === $definition->getClass() && ['$parameterName' => 'foobar'] === $definition->getArguments(); }) ))->shouldBeCalled(); - $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_bridge_doctrine_orm_filter_date_filter', Argument::allOf( + $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_doctrine_orm_filter_date_filter', Argument::allOf( Argument::type(ChildDefinition::class), Argument::that(function (ChildDefinition $definition): bool { return DateFilter::class === $definition->getParent() && ['$properties' => ['dummyDate' => null]] === $definition->getArguments(); }) ))->shouldBeCalled(); if (\PHP_VERSION_ID >= 80000) { - $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_core_bridge_doctrine_orm_filter_search_filter', Argument::allOf( + $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_doctrine_orm_filter_search_filter', Argument::allOf( Argument::type(Definition::class), Argument::that(function (Definition $definition): bool { return SearchFilter::class === $definition->getClass() && ['$properties' => ['filtered' => null]] === $definition->getArguments(); @@ -135,7 +135,7 @@ public function testProcessFilterWhichDoesNotImplementRequiredInterface(): void $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class); $containerBuilderProphecy->getParameter('api_platform.resource_class_directories')->willReturn([ - __DIR__.'/../../../../../../Fixtures/TestBundle/Entity/', + __DIR__.'/../../../../Fixtures/TestBundle/Entity/', ]); $containerBuilderProphecy->get('annotation_reader')->willReturn($readerProphecy); @@ -157,12 +157,12 @@ public function testProcessFilterWhichHasAlreadyBeenRegistered(): void $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class); $containerBuilderProphecy->getParameter('api_platform.resource_class_directories')->willReturn([ - __DIR__.'/../../../../../../Fixtures/TestBundle/Entity/', + __DIR__.'/../../../../Fixtures/TestBundle/Entity/', ]); $containerBuilderProphecy->has('annotation_reader')->willReturn(true); $containerBuilderProphecy->get('annotation_reader')->willReturn($readerProphecy); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_bridge_doctrine_orm_filter_search_filter')->willReturn(true); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_core_bridge_doctrine_orm_filter_search_filter')->willReturn(true); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_doctrine_orm_filter_search_filter')->willReturn(true); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_doctrine_orm_filter_search_filter')->willReturn(true); $containerBuilderProphecy->setDefinition(Argument::cetera())->shouldNotBeCalled(); $annotationFilterPass = new AnnotationFilterPass(); @@ -172,7 +172,7 @@ public function testProcessFilterWhichHasAlreadyBeenRegistered(): void public function testProcessInvalidFilterClass(): void { $this->expectException(DependencyInjectionInvalidArgumentException::class); - $this->expectExceptionMessage(sprintf('Class "%s" used for service "annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_bridge_doctrine_orm_filter_search_filter" cannot be found.', SearchFilter::class)); + $this->expectExceptionMessage(sprintf('Class "%s" used for service "annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_doctrine_orm_filter_search_filter" cannot be found.', SearchFilter::class)); $readerProphecy = $this->prophesize(Reader::class); $readerProphecy->getClassAnnotations(Argument::type(\ReflectionClass::class))->willReturn([]); @@ -186,11 +186,11 @@ public function testProcessInvalidFilterClass(): void $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class); $containerBuilderProphecy->getParameter('api_platform.resource_class_directories')->willReturn([ - __DIR__.'/../../../../../../Fixtures/TestBundle/Entity/', + __DIR__.'/../../../../Fixtures/TestBundle/Entity/', ]); $containerBuilderProphecy->has('annotation_reader')->willReturn($readerProphecy); $containerBuilderProphecy->get('annotation_reader')->willReturn($readerProphecy); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_core_bridge_doctrine_orm_filter_search_filter')->willReturn(false); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_doctrine_orm_filter_search_filter')->willReturn(false); $containerBuilderProphecy->getReflectionClass(SearchFilter::class, false)->willReturn(null); $annotationFilterPass = new AnnotationFilterPass(); @@ -211,7 +211,7 @@ public function testProcessFilterWithoutConstructor(): void $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class); $containerBuilderProphecy->getParameter('api_platform.resource_class_directories')->willReturn([ - __DIR__.'/../../../../../../Fixtures/TestBundle/Entity/', + __DIR__.'/../../../../Fixtures/TestBundle/Entity/', ]); $containerBuilderProphecy->has('annotation_reader')->willReturn(true); $containerBuilderProphecy->get('annotation_reader')->willReturn($readerProphecy); @@ -219,7 +219,7 @@ public function testProcessFilterWithoutConstructor(): void $containerBuilderProphecy->getReflectionClass(NoConstructorFilter::class, false)->willReturn(new \ReflectionClass(NoConstructorFilter::class)); $containerBuilderProphecy->getReflectionClass(SearchFilter::class, false)->willReturn(new \ReflectionClass(SearchFilter::class)); $containerBuilderProphecy->has(NoConstructorFilter::class)->willReturn(true); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_core_bridge_doctrine_orm_filter_search_filter')->willReturn(true); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_doctrine_orm_filter_search_filter')->willReturn(true); $containerBuilderProphecy->findDefinition(NoConstructorFilter::class)->willReturn((new Definition(NoConstructorFilter::class))->setAbstract(false)); $containerBuilderProphecy->setDefinition('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_tests_fixtures_test_bundle_filter_no_constructor_filter', Argument::allOf( Argument::type(Definition::class), @@ -246,12 +246,12 @@ public function testProcessFilterWithoutPropertiesArgument(): void $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class); $containerBuilderProphecy->getParameter('api_platform.resource_class_directories')->willReturn([ - __DIR__.'/../../../../../../Fixtures/TestBundle/Entity/', + __DIR__.'/../../../../Fixtures/TestBundle/Entity/', ]); $containerBuilderProphecy->has('annotation_reader')->willReturn(true); $containerBuilderProphecy->get('annotation_reader')->willReturn($readerProphecy); $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_api_platform_tests_fixtures_test_bundle_filter_no_properties_argument_filter')->willReturn(false); - $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_core_bridge_doctrine_orm_filter_search_filter')->willReturn(true); + $containerBuilderProphecy->has('annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_php8_api_platform_doctrine_orm_filter_search_filter')->willReturn(true); $containerBuilderProphecy->getReflectionClass(NoPropertiesArgumentFilter::class, false)->willReturn(new \ReflectionClass(NoPropertiesArgumentFilter::class)); $containerBuilderProphecy->has(NoPropertiesArgumentFilter::class)->willReturn(true); $containerBuilderProphecy->getReflectionClass(SearchFilter::class, false)->willReturn(new \ReflectionClass(SearchFilter::class)); diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPassTest.php similarity index 91% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPassTest.php index 409a7a73363..79525af8d9f 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/AuthenticatorManagerPassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\AuthenticatorManagerPass; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPassTest.php similarity index 91% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPassTest.php index e83c0f6bb1d..791bcaebadc 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/DeprecateMercurePublisherPassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\DeprecateMercurePublisherPass; use PHPUnit\Framework\TestCase; use Symfony\Component\Config\Definition\BaseNode; use Symfony\Component\DependencyInjection\Alias; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPassTest.php similarity index 95% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPassTest.php index 9d2261fd07c..b4e9d18ade9 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/ElasticsearchClientPassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\ElasticsearchClientPass; use Elasticsearch\ClientBuilder; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php similarity index 95% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php index 8b8fdf36f97..5041a63b724 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\FilterPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\FilterPass; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPassTest.php similarity index 93% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPassTest.php index 4c10777c30a..94963ceffae 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlMutationResolverPassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlMutationResolverPass; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPassTest.php similarity index 93% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPassTest.php index 4225dd751a8..8807533190a 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlQueryResolverPassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlQueryResolverPass; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePassTest.php similarity index 96% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePassTest.php index 40b180f94c7..ab5f70d5ffb 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlTypePassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlTypePass; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPassTest.php similarity index 96% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPassTest.php index d57d107d4a2..4c988b8482a 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPassTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\MetadataAwareNameConverterPass; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Alias; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/TestClientPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/TestClientPassTest.php similarity index 91% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/TestClientPassTest.php rename to tests/Symfony/Bundle/DependencyInjection/Compiler/TestClientPassTest.php index fec961a4637..1f87b5c3128 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Compiler/TestClientPassTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/Compiler/TestClientPassTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection\Compiler; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection\Compiler; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Client; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\TestClientPass; +use ApiPlatform\Symfony\Bundle\Test\Client; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php b/tests/Symfony/Bundle/DependencyInjection/ConfigurationTest.php similarity index 98% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php rename to tests/Symfony/Bundle/DependencyInjection/ConfigurationTest.php index 39fc5efb348..3bc0e869fe0 100644 --- a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php +++ b/tests/Symfony/Bundle/DependencyInjection/ConfigurationTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection; +namespace ApiPlatform\Tests\Symfony\Bundle\DependencyInjection; -use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Configuration; use ApiPlatform\Exception\FilterValidationException; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Symfony\Bundle\DependencyInjection\Configuration; use Doctrine\ORM\OptimisticLockException; use PHPUnit\Framework\TestCase; use Symfony\Component\Config\Definition\Builder\TreeBuilder; diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/B.yaml b/tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/B.yaml similarity index 100% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/B.yaml rename to tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/B.yaml diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/Bb.yaml b/tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/Bb.yaml similarity index 100% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/Bb.yaml rename to tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/Bb.yaml diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/a.yaml b/tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/a.yaml similarity index 100% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/a.yaml rename to tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/a.yaml diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/a/a.yaml b/tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/a/a.yaml similarity index 100% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/a/a.yaml rename to tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/a/a.yaml diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/b/a.yaml b/tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/b/a.yaml similarity index 100% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/b/a.yaml rename to tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/b/a.yaml diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/c.yaml b/tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/c.yaml similarity index 100% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/c.yaml rename to tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/c.yaml diff --git a/tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/c/a.yaml b/tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/c/a.yaml similarity index 100% rename from tests/Core/Bridge/Symfony/Bundle/DependencyInjection/Fixtures/resources/c/a.yaml rename to tests/Symfony/Bundle/DependencyInjection/Fixtures/resources/c/a.yaml diff --git a/tests/Core/Bridge/Symfony/Bundle/EventListener/SwaggerUiListenerTest.php b/tests/Symfony/Bundle/EventListener/SwaggerUiListenerTest.php similarity index 92% rename from tests/Core/Bridge/Symfony/Bundle/EventListener/SwaggerUiListenerTest.php rename to tests/Symfony/Bundle/EventListener/SwaggerUiListenerTest.php index f451715842d..080eaa62f64 100644 --- a/tests/Core/Bridge/Symfony/Bundle/EventListener/SwaggerUiListenerTest.php +++ b/tests/Symfony/Bundle/EventListener/SwaggerUiListenerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\EventListener; +namespace ApiPlatform\Tests\Symfony\Bundle\EventListener; -use ApiPlatform\Core\Bridge\Symfony\Bundle\EventListener\SwaggerUiListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Bundle\EventListener\SwaggerUiListener; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/tests/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiActionTest.php b/tests/Symfony/Bundle/SwaggerUi/SwaggerUiActionTest.php similarity index 94% rename from tests/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiActionTest.php rename to tests/Symfony/Bundle/SwaggerUi/SwaggerUiActionTest.php index f52c7130829..3a36df7517f 100644 --- a/tests/Core/Bridge/Symfony/Bundle/SwaggerUi/SwaggerUiActionTest.php +++ b/tests/Symfony/Bundle/SwaggerUi/SwaggerUiActionTest.php @@ -11,19 +11,19 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\SwaggerUi; +namespace ApiPlatform\Tests\Symfony\Bundle\SwaggerUi; -use ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiAction; -use ApiPlatform\Core\Bridge\Symfony\Bundle\SwaggerUi\SwaggerUiContext; -use ApiPlatform\Core\Documentation\DocumentationInterface; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface; -use ApiPlatform\Core\OpenApi\Model\Info; -use ApiPlatform\Core\OpenApi\Model\Paths; -use ApiPlatform\Core\OpenApi\OpenApi; -use ApiPlatform\Core\OpenApi\Options; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Documentation\DocumentationInterface; +use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface; +use ApiPlatform\OpenApi\Model\Info; +use ApiPlatform\OpenApi\Model\Paths; +use ApiPlatform\OpenApi\OpenApi; +use ApiPlatform\OpenApi\Options; +use ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiAction; +use ApiPlatform\Symfony\Bundle\SwaggerUi\SwaggerUiContext; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php b/tests/Symfony/Bundle/Test/ApiTestCaseTest.php similarity index 98% rename from tests/Core/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php rename to tests/Symfony/Bundle/Test/ApiTestCaseTest.php index 95391ffe7a4..5bda0a07223 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php +++ b/tests/Symfony/Bundle/Test/ApiTestCaseTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Tests\Symfony\Bundle\Test; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; use ApiPlatform\Tests\Fixtures\TestBundle\Document\Dummy as DummyDocument; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyDtoInputOutput; diff --git a/tests/Core/Bridge/Symfony/Bundle/Test/ClientTest.php b/tests/Symfony/Bundle/Test/ClientTest.php similarity index 96% rename from tests/Core/Bridge/Symfony/Bundle/Test/ClientTest.php rename to tests/Symfony/Bundle/Test/ClientTest.php index 888cf95e8e9..639ac497612 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Test/ClientTest.php +++ b/tests/Symfony/Bundle/Test/ClientTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Tests\Symfony\Bundle\Test; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestCase; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Response; +use ApiPlatform\Symfony\Bundle\Test\ApiTestCase; +use ApiPlatform\Symfony\Bundle\Test\Response; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\SchemaTool; use PHPUnit\Runner\Version; diff --git a/tests/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetTest.php b/tests/Symfony/Bundle/Test/Constraint/ArraySubsetTest.php similarity index 96% rename from tests/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetTest.php rename to tests/Symfony/Bundle/Test/Constraint/ArraySubsetTest.php index 00286e7f5e9..3d833df7110 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetTest.php +++ b/tests/Symfony/Bundle/Test/Constraint/ArraySubsetTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Test\Constraint; +namespace ApiPlatform\Tests\Symfony\Bundle\Test\Constraint; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\ArraySubset; +use ApiPlatform\Symfony\Bundle\Test\Constraint\ArraySubset; use ApiPlatform\Tests\Fixtures\ArrayAccessible; use PHPUnit\Framework\ExpectationFailedException; use PHPUnit\Framework\SelfDescribing; diff --git a/tests/Core/Bridge/Symfony/Bundle/Test/Constraint/MatchesJsonSchemaTest.php b/tests/Symfony/Bundle/Test/Constraint/MatchesJsonSchemaTest.php similarity index 88% rename from tests/Core/Bridge/Symfony/Bundle/Test/Constraint/MatchesJsonSchemaTest.php rename to tests/Symfony/Bundle/Test/Constraint/MatchesJsonSchemaTest.php index 13165f15d15..5acf0bbdcae 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Test/Constraint/MatchesJsonSchemaTest.php +++ b/tests/Symfony/Bundle/Test/Constraint/MatchesJsonSchemaTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Test\Constraint; +namespace ApiPlatform\Tests\Symfony\Bundle\Test\Constraint; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\MatchesJsonSchema; +use ApiPlatform\Symfony\Bundle\Test\Constraint\MatchesJsonSchema; use PHPUnit\Framework\ExpectationFailedException; use PHPUnit\Framework\TestCase; use PHPUnit\Runner\Version; diff --git a/tests/Core/Bridge/Symfony/Bundle/Test/ResponseTest.php b/tests/Symfony/Bundle/Test/ResponseTest.php similarity index 97% rename from tests/Core/Bridge/Symfony/Bundle/Test/ResponseTest.php rename to tests/Symfony/Bundle/Test/ResponseTest.php index ac5ba4bfa0a..56e4a80410f 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Test/ResponseTest.php +++ b/tests/Symfony/Bundle/Test/ResponseTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Tests\Symfony\Bundle\Test; -use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Response; +use ApiPlatform\Symfony\Bundle\Test\Response; use PHPUnit\Framework\TestCase; use Symfony\Component\BrowserKit\Response as BrowserKitResponse; use Symfony\Component\HttpClient\Exception\ClientException; diff --git a/tests/Core/Bridge/Symfony/Bundle/Test/WebTestCaseTest.php b/tests/Symfony/Bundle/Test/WebTestCaseTest.php similarity index 99% rename from tests/Core/Bridge/Symfony/Bundle/Test/WebTestCaseTest.php rename to tests/Symfony/Bundle/Test/WebTestCaseTest.php index 7e66ebdf422..2c1fa7d66cf 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Test/WebTestCaseTest.php +++ b/tests/Symfony/Bundle/Test/WebTestCaseTest.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Test; +namespace ApiPlatform\Tests\Symfony\Bundle\Test; use PHPUnit\Framework\AssertionFailedError; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php b/tests/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php similarity index 99% rename from tests/Core/Bridge/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php rename to tests/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php index a15aa0126cf..30abbc4c4a0 100644 --- a/tests/Core/Bridge/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php +++ b/tests/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\Twig; +namespace ApiPlatform\Tests\Symfony\Bundle\Twig; use ApiPlatform\Core\Bridge\Doctrine\Common\DataPersister; use ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\CollectionDataProvider as OdmCollectionDataProvider; diff --git a/tests/Core/EventListener/AddFormatListenerTest.php b/tests/Symfony/EventListener/AddFormatListenerTest.php similarity index 98% rename from tests/Core/EventListener/AddFormatListenerTest.php rename to tests/Symfony/EventListener/AddFormatListenerTest.php index 2488f23d44b..a353e505397 100644 --- a/tests/Core/EventListener/AddFormatListenerTest.php +++ b/tests/Symfony/EventListener/AddFormatListenerTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; use ApiPlatform\Core\Api\FormatsProviderInterface; -use ApiPlatform\Core\EventListener\AddFormatListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\AddFormatListener; use Negotiation\Negotiator; use PHPUnit\Framework\TestCase; use Prophecy\Argument; @@ -369,7 +369,7 @@ public function testResourceClassSupportedRequestFormat(): void */ public function testLegacyFormatsParameter($formatsProvider): void { - $this->expectDeprecation('Since api-plaform/core 2.5: Passing an array or an instance of "ApiPlatform\Core\Api\FormatsProviderInterface" as 2nd parameter of the constructor of "ApiPlatform\Core\EventListener\AddFormatListener" is deprecated since API Platform 2.5, pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead'); + $this->expectDeprecation('Since api-plaform/core 2.5: Passing an array or an instance of "ApiPlatform\Core\Api\FormatsProviderInterface" as 2nd parameter of the constructor of "ApiPlatform\Symfony\EventListener\AddFormatListener" is deprecated since API Platform 2.5, pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead'); new AddFormatListener(new Negotiator(), $formatsProvider); } diff --git a/tests/Core/Mercure/EventListener/AddLinkHeaderListenerTest.php b/tests/Symfony/EventListener/AddLinkHeaderListenerTest.php similarity index 98% rename from tests/Core/Mercure/EventListener/AddLinkHeaderListenerTest.php rename to tests/Symfony/EventListener/AddLinkHeaderListenerTest.php index 25197de4a07..fab50f1fdec 100644 --- a/tests/Core/Mercure/EventListener/AddLinkHeaderListenerTest.php +++ b/tests/Symfony/EventListener/AddLinkHeaderListenerTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Mercure\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; -use ApiPlatform\Core\Mercure\EventListener\AddLinkHeaderListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\AddLinkHeaderListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use Fig\Link\GenericLinkProvider; use Fig\Link\Link; diff --git a/tests/Core/Security/EventListener/DenyAccessListenerTest.php b/tests/Symfony/EventListener/DenyAccessListenerTest.php similarity index 98% rename from tests/Core/Security/EventListener/DenyAccessListenerTest.php rename to tests/Symfony/EventListener/DenyAccessListenerTest.php index 4127b2a5aa8..a738871de28 100644 --- a/tests/Core/Security/EventListener/DenyAccessListenerTest.php +++ b/tests/Symfony/EventListener/DenyAccessListenerTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Security\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Security\EventListener\DenyAccessListener; -use ApiPlatform\Core\Security\ExpressionLanguage; -use ApiPlatform\Core\Security\ResourceAccessCheckerInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\DenyAccessListener; +use ApiPlatform\Symfony\Security\ExpressionLanguage; +use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface; use ApiPlatform\Tests\Fixtures\Serializable; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/EventListener/DeserializeListenerTest.php b/tests/Symfony/EventListener/DeserializeListenerTest.php similarity index 97% rename from tests/Core/EventListener/DeserializeListenerTest.php rename to tests/Symfony/EventListener/DeserializeListenerTest.php index 752766e8788..92598f22a5b 100644 --- a/tests/Core/EventListener/DeserializeListenerTest.php +++ b/tests/Symfony/EventListener/DeserializeListenerTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; use ApiPlatform\Core\Api\FormatsProviderInterface; -use ApiPlatform\Core\EventListener\DeserializeListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; +use ApiPlatform\Symfony\EventListener\DeserializeListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Prophecy\Argument; @@ -352,7 +352,7 @@ public function testNoContentType(): void /** * @group legacy - * @expectedDeprecation Passing an array or an instance of "ApiPlatform\Core\Api\FormatsProviderInterface" as 3rd parameter of the constructor of "ApiPlatform\Core\EventListener\DeserializeListener" is deprecated since API Platform 2.5, pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead + * @expectedDeprecation Passing an array or an instance of "ApiPlatform\Core\Api\FormatsProviderInterface" as 3rd parameter of the constructor of "ApiPlatform\Symfony\EventListener\DeserializeListener" is deprecated since API Platform 2.5, pass an instance of "ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface" instead */ public function testLegacyFormatsParameter(): void { diff --git a/tests/Core/EventListener/EventPrioritiesTest.php b/tests/Symfony/EventListener/EventPrioritiesTest.php similarity index 91% rename from tests/Core/EventListener/EventPrioritiesTest.php rename to tests/Symfony/EventListener/EventPrioritiesTest.php index 4c80b8cb229..e6f86f44921 100644 --- a/tests/Core/EventListener/EventPrioritiesTest.php +++ b/tests/Symfony/EventListener/EventPrioritiesTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; -use ApiPlatform\Core\EventListener\EventPriorities; +use ApiPlatform\Symfony\EventListener\EventPriorities; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Core/EventListener/ExceptionListenerTest.php b/tests/Symfony/EventListener/ExceptionListenerTest.php similarity index 96% rename from tests/Core/EventListener/ExceptionListenerTest.php rename to tests/Symfony/EventListener/ExceptionListenerTest.php index 9edfec97f14..cd5128bcc2b 100644 --- a/tests/Core/EventListener/ExceptionListenerTest.php +++ b/tests/Symfony/EventListener/ExceptionListenerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; -use ApiPlatform\Core\EventListener\ExceptionListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\ExceptionListener; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/JsonApi/EventListener/TransformFieldsetsParametersListenerTest.php b/tests/Symfony/EventListener/JsonApi/TransformFieldsetsParametersListenerTest.php similarity index 97% rename from tests/Core/JsonApi/EventListener/TransformFieldsetsParametersListenerTest.php rename to tests/Symfony/EventListener/JsonApi/TransformFieldsetsParametersListenerTest.php index c50f189433f..472d75db8be 100644 --- a/tests/Core/JsonApi/EventListener/TransformFieldsetsParametersListenerTest.php +++ b/tests/Symfony/EventListener/JsonApi/TransformFieldsetsParametersListenerTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener\JsonApi; -use ApiPlatform\Core\JsonApi\EventListener\TransformFieldsetsParametersListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\JsonApi\TransformFieldsetsParametersListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/JsonApi/EventListener/TransformFilteringParametersListenerTest.php b/tests/Symfony/EventListener/JsonApi/TransformFilteringParametersListenerTest.php similarity index 94% rename from tests/Core/JsonApi/EventListener/TransformFilteringParametersListenerTest.php rename to tests/Symfony/EventListener/JsonApi/TransformFilteringParametersListenerTest.php index 04905fd497a..c3498dbe14e 100644 --- a/tests/Core/JsonApi/EventListener/TransformFilteringParametersListenerTest.php +++ b/tests/Symfony/EventListener/JsonApi/TransformFilteringParametersListenerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener\JsonApi; -use ApiPlatform\Core\JsonApi\EventListener\TransformFilteringParametersListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\JsonApi\TransformFilteringParametersListener; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/tests/Core/JsonApi/EventListener/TransformPaginationParametersListenerTest.php b/tests/Symfony/EventListener/JsonApi/TransformPaginationParametersListenerTest.php similarity index 95% rename from tests/Core/JsonApi/EventListener/TransformPaginationParametersListenerTest.php rename to tests/Symfony/EventListener/JsonApi/TransformPaginationParametersListenerTest.php index e585d201151..551be244100 100644 --- a/tests/Core/JsonApi/EventListener/TransformPaginationParametersListenerTest.php +++ b/tests/Symfony/EventListener/JsonApi/TransformPaginationParametersListenerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener\JsonApi; -use ApiPlatform\Core\JsonApi\EventListener\TransformPaginationParametersListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\JsonApi\TransformPaginationParametersListener; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/tests/Core/JsonApi/EventListener/TransformSortingParametersListenerTest.php b/tests/Symfony/EventListener/JsonApi/TransformSortingParametersListenerTest.php similarity index 95% rename from tests/Core/JsonApi/EventListener/TransformSortingParametersListenerTest.php rename to tests/Symfony/EventListener/JsonApi/TransformSortingParametersListenerTest.php index 489e39577ee..b1b42b05907 100644 --- a/tests/Core/JsonApi/EventListener/TransformSortingParametersListenerTest.php +++ b/tests/Symfony/EventListener/JsonApi/TransformSortingParametersListenerTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\JsonApi\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener\JsonApi; -use ApiPlatform\Core\JsonApi\EventListener\TransformSortingParametersListener; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\JsonApi\TransformSortingParametersListener; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/tests/Core/EventListener/QueryParameterValidateListenerTest.php b/tests/Symfony/EventListener/QueryParameterValidateListenerTest.php similarity index 98% rename from tests/Core/EventListener/QueryParameterValidateListenerTest.php rename to tests/Symfony/EventListener/QueryParameterValidateListenerTest.php index aef719fe1be..27885a58bdb 100644 --- a/tests/Core/EventListener/QueryParameterValidateListenerTest.php +++ b/tests/Symfony/EventListener/QueryParameterValidateListenerTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; -use ApiPlatform\Core\EventListener\QueryParameterValidateListener; use ApiPlatform\Core\Filter\QueryParameterValidator; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\FilterValidationException; +use ApiPlatform\Symfony\EventListener\QueryParameterValidateListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Symfony/EventListener/ReadListenerTest.php b/tests/Symfony/EventListener/ReadListenerTest.php index da97007ca6f..78c397c8c2f 100644 --- a/tests/Symfony/EventListener/ReadListenerTest.php +++ b/tests/Symfony/EventListener/ReadListenerTest.php @@ -14,7 +14,6 @@ namespace ApiPlatform\Tests\Symfony\EventListener; use ApiPlatform\Api\UriVariablesConverterInterface; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Get; @@ -23,6 +22,7 @@ use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; use ApiPlatform\Metadata\UriVariable; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; use ApiPlatform\State\ProviderInterface; use ApiPlatform\Symfony\EventListener\ReadListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; diff --git a/tests/Core/EventListener/RespondListenerTest.php b/tests/Symfony/EventListener/RespondListenerTest.php similarity index 98% rename from tests/Core/EventListener/RespondListenerTest.php rename to tests/Symfony/EventListener/RespondListenerTest.php index 27889595560..fb2d1955dec 100644 --- a/tests/Core/EventListener/RespondListenerTest.php +++ b/tests/Symfony/EventListener/RespondListenerTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; -use ApiPlatform\Core\EventListener\RespondListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\EventListener\RespondListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/EventListener/SerializeListenerTest.php b/tests/Symfony/EventListener/SerializeListenerTest.php similarity index 97% rename from tests/Core/EventListener/SerializeListenerTest.php rename to tests/Symfony/EventListener/SerializeListenerTest.php index 682b4ed73ce..9bd812ff55d 100644 --- a/tests/Core/EventListener/SerializeListenerTest.php +++ b/tests/Symfony/EventListener/SerializeListenerTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\EventListener; +namespace ApiPlatform\Tests\Symfony\EventListener; -use ApiPlatform\Core\EventListener\SerializeListener; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; -use ApiPlatform\Core\Serializer\ResourceList; -use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Serializer\ResourceList; +use ApiPlatform\Serializer\SerializerContextBuilderInterface; +use ApiPlatform\Symfony\EventListener\SerializeListener; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; use Prophecy\Argument; diff --git a/tests/Core/Bridge/Symfony/Messenger/ContextStampTest.php b/tests/Symfony/Messenger/ContextStampTest.php similarity index 86% rename from tests/Core/Bridge/Symfony/Messenger/ContextStampTest.php rename to tests/Symfony/Messenger/ContextStampTest.php index 0c2cbddf74f..8f46f0b6c48 100644 --- a/tests/Core/Bridge/Symfony/Messenger/ContextStampTest.php +++ b/tests/Symfony/Messenger/ContextStampTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Messenger; +namespace ApiPlatform\Tests\Symfony\Messenger; -use ApiPlatform\Core\Bridge\Symfony\Messenger\ContextStamp; +use ApiPlatform\Symfony\Messenger\ContextStamp; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Stamp\StampInterface; diff --git a/tests/Core/Bridge/Symfony/Messenger/DataTransformerTest.php b/tests/Symfony/Messenger/DataTransformerTest.php similarity index 97% rename from tests/Core/Bridge/Symfony/Messenger/DataTransformerTest.php rename to tests/Symfony/Messenger/DataTransformerTest.php index 80bbb523f27..c4eaf998bad 100644 --- a/tests/Core/Bridge/Symfony/Messenger/DataTransformerTest.php +++ b/tests/Symfony/Messenger/DataTransformerTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Messenger; +namespace ApiPlatform\Tests\Symfony\Messenger; use ApiPlatform\Core\Api\OperationType; -use ApiPlatform\Core\Bridge\Symfony\Messenger\DataTransformer; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceMetadata; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Messenger\DataTransformer; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Bridge/Symfony/Messenger/ProcessorTest.php b/tests/Symfony/Messenger/ProcessorTest.php similarity index 97% rename from tests/Bridge/Symfony/Messenger/ProcessorTest.php rename to tests/Symfony/Messenger/ProcessorTest.php index 96148a2cf74..1e068ed1db2 100644 --- a/tests/Bridge/Symfony/Messenger/ProcessorTest.php +++ b/tests/Symfony/Messenger/ProcessorTest.php @@ -11,10 +11,8 @@ declare(strict_types=1); -namespace ApiPlatform\Tests\Bridge\Symfony\Messenger; +namespace ApiPlatform\Tests\Symfony\Messenger; -use ApiPlatform\Core\Bridge\Symfony\Messenger\ContextStamp; -use ApiPlatform\Core\Bridge\Symfony\Messenger\RemoveStamp; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Exception\OperationNotFoundException; use ApiPlatform\Metadata\ApiResource; @@ -25,7 +23,9 @@ use ApiPlatform\Metadata\Post; use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; +use ApiPlatform\Symfony\Messenger\ContextStamp; use ApiPlatform\Symfony\Messenger\Processor; +use ApiPlatform\Symfony\Messenger\RemoveStamp; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyCar; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Symfony/Messenger/RemoveStampTest.php b/tests/Symfony/Messenger/RemoveStampTest.php similarity index 82% rename from tests/Core/Bridge/Symfony/Messenger/RemoveStampTest.php rename to tests/Symfony/Messenger/RemoveStampTest.php index 872d84b3dc4..fa5f1a37921 100644 --- a/tests/Core/Bridge/Symfony/Messenger/RemoveStampTest.php +++ b/tests/Symfony/Messenger/RemoveStampTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Messenger; +namespace ApiPlatform\Tests\Symfony\Messenger; -use ApiPlatform\Core\Bridge\Symfony\Messenger\RemoveStamp; +use ApiPlatform\Symfony\Messenger\RemoveStamp; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Stamp\StampInterface; diff --git a/tests/Symfony/Routing/ApiLoaderTest.php b/tests/Symfony/Routing/ApiLoaderTest.php index 8de513bed73..7e79f9c68e9 100644 --- a/tests/Symfony/Routing/ApiLoaderTest.php +++ b/tests/Symfony/Routing/ApiLoaderTest.php @@ -11,18 +11,15 @@ declare(strict_types=1); -namespace ApiPlatform\Symfony\Routing; +namespace ApiPlatform\Tests\Symfony\Routing; use ApiPlatform\Core\Api\IdentifiersExtractorInterface; -use ApiPlatform\Core\Bridge\Symfony\Routing\ApiLoader; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Property\PropertyNameCollection; use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface; use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection; use ApiPlatform\Core\Operation\UnderscorePathSegmentNameGenerator; -use ApiPlatform\Core\PathResolver\CustomOperationPathResolver; -use ApiPlatform\Core\PathResolver\OperationPathResolver; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiResource; @@ -34,6 +31,9 @@ use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; use ApiPlatform\Metadata\Resource\ResourceMetadataCollection; use ApiPlatform\Metadata\UriVariable; +use ApiPlatform\PathResolver\CustomOperationPathResolver; +use ApiPlatform\PathResolver\OperationPathResolver; +use ApiPlatform\Symfony\Routing\ApiLoader; use ApiPlatform\Tests\Fixtures\DummyEntity; use ApiPlatform\Tests\Fixtures\RelatedDummyEntity; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; @@ -250,7 +250,7 @@ public function testApiLoaderWithPrefix() private function getApiLoaderWithResourceMetadataCollection(ResourceMetadataCollection $resourceCollection): ApiLoader { - $routingConfig = __DIR__.'/../../../src/Core/Bridge/Symfony/Bundle/Resources/config/routing'; + $routingConfig = __DIR__.'/../../../src/Symfony/Bundle/Resources/config/routing'; $kernelProphecy = $this->prophesize(KernelInterface::class); $kernelProphecy->locateResource(Argument::any())->willReturn($routingConfig); diff --git a/tests/Core/Bridge/Symfony/Routing/RouterTest.php b/tests/Symfony/Routing/RouterTest.php similarity index 97% rename from tests/Core/Bridge/Symfony/Routing/RouterTest.php rename to tests/Symfony/Routing/RouterTest.php index 52dc0d2e613..54501e7eea0 100644 --- a/tests/Core/Bridge/Symfony/Routing/RouterTest.php +++ b/tests/Symfony/Routing/RouterTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Routing; +namespace ApiPlatform\Tests\Symfony\Routing; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Bridge\Symfony\Routing\Router; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Routing\Router; use PHPUnit\Framework\TestCase; use Prophecy\Argument; use Symfony\Component\Routing\Exception\ExceptionInterface as RoutingExceptionInterface; diff --git a/tests/Core/Security/ResourceAccessCheckerTest.php b/tests/Symfony/Security/ResourceAccessCheckerTest.php similarity index 97% rename from tests/Core/Security/ResourceAccessCheckerTest.php rename to tests/Symfony/Security/ResourceAccessCheckerTest.php index 7b76d3679f0..f5d39f8717b 100644 --- a/tests/Core/Security/ResourceAccessCheckerTest.php +++ b/tests/Symfony/Security/ResourceAccessCheckerTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Security; +namespace ApiPlatform\Tests\Symfony\Security; -use ApiPlatform\Core\Security\ExpressionLanguage; -use ApiPlatform\Core\Security\ResourceAccessChecker; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Security\ExpressionLanguage; +use ApiPlatform\Symfony\Security\ResourceAccessChecker; use ApiPlatform\Tests\Fixtures\Serializable; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; use PHPUnit\Framework\TestCase; diff --git a/tests/Core/Bridge/Symfony/Validator/Exception/ValidationExceptionTest.php b/tests/Symfony/Validator/Metadata/Exception/ValidationExceptionTest.php similarity index 83% rename from tests/Core/Bridge/Symfony/Validator/Exception/ValidationExceptionTest.php rename to tests/Symfony/Validator/Metadata/Exception/ValidationExceptionTest.php index 6dd0fac7a1a..a83a50d164e 100644 --- a/tests/Core/Bridge/Symfony/Validator/Exception/ValidationExceptionTest.php +++ b/tests/Symfony/Validator/Metadata/Exception/ValidationExceptionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Exception; +namespace ApiPlatform\Tests\Symfony\Validator\Exception; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; -use ApiPlatform\Core\Validator\Exception\ValidationException as MainValidationException; use ApiPlatform\Exception\RuntimeException; +use ApiPlatform\Symfony\EventListener\Exception\ValidationException as MainValidationException; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\ConstraintViolation; use Symfony\Component\Validator\ConstraintViolationList; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaChoiceRestrictionTest.php similarity index 97% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaChoiceRestrictionTest.php index 2ffd785fec9..11a8694c595 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaChoiceRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaChoiceRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaChoiceRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaChoiceRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Validator\Constraint; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaCollectionRestrictionTest.php similarity index 91% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaCollectionRestrictionTest.php index 3ec4c96981e..c5a84217e24 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCollectionRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaCollectionRestrictionTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCollectionRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCollectionRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints\Collection; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaCountRestrictionTest.php similarity index 91% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaCountRestrictionTest.php index e9e52add124..93b910e9a8c 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaCountRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaCountRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCountRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCountRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints\Count; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormatTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaFormatTest.php similarity index 94% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormatTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaFormatTest.php index fd51b9cc5be..9af541d34ee 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormatTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaFormatTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints\Email; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestrictionTest.php similarity index 92% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestrictionTest.php index ad6ec9eb09f..d88154c5b7c 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaGreaterThanOrEqualRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanOrEqualRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanOrEqualRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Validator\Constraint; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaGreaterThanRestrictionTest.php similarity index 92% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaGreaterThanRestrictionTest.php index 013da4d248c..f5341ff61b0 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaGreaterThanRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaGreaterThanRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Validator\Constraint; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestrictionTest.php similarity index 92% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestrictionTest.php index fa46a8b5714..7d0bf45a472 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaLessThanOrEqualRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanOrEqualRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanOrEqualRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Validator\Constraint; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaLessThanRestrictionTest.php similarity index 92% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaLessThanRestrictionTest.php index 960bac040bc..28ee8be5bed 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLessThanRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaLessThanRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Validator\Constraint; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaOneOfRestrictionTest.php similarity index 86% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaOneOfRestrictionTest.php index 0784de9e83a..d21933298b7 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaOneOfRestrictionTest.php @@ -11,13 +11,13 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaOneOfRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaOneOfRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Validator\Constraint; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaRangeRestrictionTest.php similarity index 93% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaRangeRestrictionTest.php index c67f4aa000e..bac30a00caf 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaRangeRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRangeRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRangeRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Validator\Constraint; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaRegexRestrictionTest.php similarity index 92% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaRegexRestrictionTest.php index 99e897edba0..5a92104fb64 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaRegexRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints\Positive; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestrictionTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaUniqueRestrictionTest.php similarity index 88% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestrictionTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaUniqueRestrictionTest.php index b218a052609..b9cc2945198 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaUniqueRestrictionTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/Restriction/PropertySchemaUniqueRestrictionTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property\Restriction; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property\Restriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaUniqueRestriction; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaUniqueRestriction; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints\Positive; diff --git a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php b/tests/Symfony/Validator/Metadata/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php similarity index 95% rename from tests/Core/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php rename to tests/Symfony/Validator/Metadata/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php index f0572985f58..e96239a9908 100644 --- a/tests/Core/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php +++ b/tests/Symfony/Validator/Metadata/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php @@ -11,25 +11,25 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\Metadata\Property; - -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaChoiceRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCollectionRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCountRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanOrEqualRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanOrEqualRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaOneOfRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRangeRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaUniqueRestriction; -use ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\ValidatorPropertyMetadataFactory; +namespace ApiPlatform\Tests\Symfony\Validator\Metadata\Property; + use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Tests\ProphecyTrait; use ApiPlatform\Metadata\ApiProperty; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaChoiceRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCollectionRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaCountRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaFormat; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanOrEqualRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaGreaterThanRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLengthRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanOrEqualRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaLessThanRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaOneOfRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRangeRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRegexRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaUniqueRestriction; +use ApiPlatform\Symfony\Validator\Metadata\Property\ValidatorPropertyMetadataFactory; use ApiPlatform\Tests\Fixtures\DummyAtLeastOneOfValidatedEntity; use ApiPlatform\Tests\Fixtures\DummyCollectionValidatedEntity; use ApiPlatform\Tests\Fixtures\DummyCompoundValidatedEntity; diff --git a/tests/Core/Bridge/Symfony/Validator/EventListener/ValidationExceptionListenerTest.php b/tests/Symfony/Validator/Metadata/ValidationExceptionListenerTest.php similarity index 93% rename from tests/Core/Bridge/Symfony/Validator/EventListener/ValidationExceptionListenerTest.php rename to tests/Symfony/Validator/Metadata/ValidationExceptionListenerTest.php index c0f38d34b3c..d25d9c1eb92 100644 --- a/tests/Core/Bridge/Symfony/Validator/EventListener/ValidationExceptionListenerTest.php +++ b/tests/Symfony/Validator/Metadata/ValidationExceptionListenerTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator\EventListener; +namespace ApiPlatform\Tests\Symfony\Validator\EventListener; -use ApiPlatform\Core\Bridge\Symfony\Validator\EventListener\ValidationExceptionListener; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ConstraintViolationListAwareExceptionInterface; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; use ApiPlatform\Core\Tests\ProphecyTrait; -use ApiPlatform\Core\Validator\Exception\ValidationException as BaseValidationException; use ApiPlatform\Exception\FilterValidationException; +use ApiPlatform\Symfony\EventListener\Exception\ValidationException as BaseValidationException; +use ApiPlatform\Symfony\Validator\EventListener\ValidationExceptionListener; +use ApiPlatform\Symfony\Validator\Exception\ConstraintViolationListAwareExceptionInterface; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/tests/Core/Bridge/Symfony/Validator/ValidatorTest.php b/tests/Symfony/Validator/Metadata/ValidatorTest.php similarity index 93% rename from tests/Core/Bridge/Symfony/Validator/ValidatorTest.php rename to tests/Symfony/Validator/Metadata/ValidatorTest.php index 3911c6a5384..46f146e7814 100644 --- a/tests/Core/Bridge/Symfony/Validator/ValidatorTest.php +++ b/tests/Symfony/Validator/Metadata/ValidatorTest.php @@ -11,12 +11,12 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Bridge\Symfony\Validator; +namespace ApiPlatform\Tests\Symfony\Validator; -use ApiPlatform\Core\Bridge\Symfony\Validator\Exception\ValidationException; -use ApiPlatform\Core\Bridge\Symfony\Validator\ValidationGroupsGeneratorInterface; -use ApiPlatform\Core\Bridge\Symfony\Validator\Validator; use ApiPlatform\Core\Tests\ProphecyTrait; +use ApiPlatform\Symfony\Validator\Exception\ValidationException; +use ApiPlatform\Symfony\Validator\ValidationGroupsGeneratorInterface; +use ApiPlatform\Symfony\Validator\Validator; use ApiPlatform\Tests\Fixtures\DummyEntity; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; @@ -102,7 +102,7 @@ public function __invoke($data): array /** * @group legacy - * @expectedDeprecation Using a public validation groups generator service not implementing "ApiPlatform\Core\Bridge\Symfony\Validator\ValidationGroupsGeneratorInterface" is deprecated since 2.6 and will be removed in 3.0. + * @expectedDeprecation Using a public validation groups generator service not implementing "ApiPlatform\Symfony\Validator\ValidationGroupsGeneratorInterface" is deprecated since 2.6 and will be removed in 3.0. */ public function testValidateGetGroupsFromLegacyService(): void { diff --git a/tests/Core/Util/AnnotationFilterExtractorTraitTest.php b/tests/Util/AnnotationFilterExtractorTraitTest.php similarity index 75% rename from tests/Core/Util/AnnotationFilterExtractorTraitTest.php rename to tests/Util/AnnotationFilterExtractorTraitTest.php index bc5eb8a7470..6ebac05fb5c 100644 --- a/tests/Core/Util/AnnotationFilterExtractorTraitTest.php +++ b/tests/Util/AnnotationFilterExtractorTraitTest.php @@ -11,14 +11,14 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\DateFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\OrderFilter; -use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter; -use ApiPlatform\Core\Serializer\Filter\GroupFilter; -use ApiPlatform\Core\Serializer\Filter\PropertyFilter; +use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; +use ApiPlatform\Doctrine\Orm\Filter\DateFilter; +use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; +use ApiPlatform\Doctrine\Orm\Filter\SearchFilter; +use ApiPlatform\Serializer\Filter\GroupFilter; +use ApiPlatform\Serializer\Filter\PropertyFilter; use ApiPlatform\Tests\Fixtures\DummyEntityFilterAnnotated; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyCar; use ApiPlatform\Tests\Fixtures\TestBundle\Util\AnnotationFilterExtractor; @@ -38,27 +38,27 @@ public function testReadAnnotations() { $reflectionClass = new \ReflectionClass(DummyCar::class); $this->assertEquals($this->extractor->getFilters($reflectionClass), [ - 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_core_bridge_doctrine_orm_filter_date_filter' => [ + 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_doctrine_orm_filter_date_filter' => [ ['properties' => ['id' => 'exclude_null', 'colors' => 'exclude_null', 'name' => 'exclude_null', 'canSell' => 'exclude_null', 'availableAt' => 'exclude_null', 'brand' => 'exclude_null', 'secondColors' => 'exclude_null', 'thirdColors' => 'exclude_null', 'uuid' => 'exclude_null']], DateFilter::class, ], - 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_core_bridge_doctrine_orm_filter_boolean_filter' => [ + 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_doctrine_orm_filter_boolean_filter' => [ [], BooleanFilter::class, ], - 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_core_bridge_doctrine_orm_filter_search_filter' => [ + 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_doctrine_orm_filter_search_filter' => [ ['properties' => ['name' => 'partial', 'colors.prop' => 'ipartial', 'colors' => 'exact', 'secondColors' => 'exact', 'thirdColors' => 'exact', 'uuid' => 'exact']], SearchFilter::class, ], - 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_core_serializer_filter_property_filter' => [ + 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_serializer_filter_property_filter' => [ ['parameterName' => 'foobar'], PropertyFilter::class, ], - 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_core_serializer_filter_group_filter' => [ + 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_serializer_filter_group_filter' => [ ['parameterName' => 'foobargroups'], GroupFilter::class, ], - 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_core_serializer_filter_group_filter_override' => [ + 'annotated_api_platform_tests_fixtures_test_bundle_entity_dummy_car_api_platform_serializer_filter_group_filter_override' => [ ['parameterName' => 'foobargroups_override'], GroupFilter::class, ], @@ -70,7 +70,7 @@ public function testReadOrderAnnotations() $reflectionClass = new \ReflectionClass(DummyEntityFilterAnnotated::class); $this->assertEquals($this->extractor->getFilters($reflectionClass), [ - 'annotated_api_platform_tests_fixtures_dummy_entity_filter_annotated_api_platform_core_bridge_doctrine_orm_filter_order_filter' => [ + 'annotated_api_platform_tests_fixtures_dummy_entity_filter_annotated_api_platform_doctrine_orm_filter_order_filter' => [ [ 'orderParameterName' => 'positionOrder', 'properties' => [ diff --git a/tests/Core/Util/ArrayTraitTest.php b/tests/Util/ArrayTraitTest.php similarity index 95% rename from tests/Core/Util/ArrayTraitTest.php rename to tests/Util/ArrayTraitTest.php index 98671f0603f..7c90d0569f1 100644 --- a/tests/Core/Util/ArrayTraitTest.php +++ b/tests/Util/ArrayTraitTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Util\ArrayTrait; +use ApiPlatform\Util\ArrayTrait; use PHPUnit\Framework\TestCase; class ArrayTraitTest extends TestCase diff --git a/tests/Core/Util/ClassInfoTraitTest.php b/tests/Util/ClassInfoTraitTest.php similarity index 94% rename from tests/Core/Util/ClassInfoTraitTest.php rename to tests/Util/ClassInfoTraitTest.php index 9c1df73ff70..4cdc9b0bf5e 100644 --- a/tests/Core/Util/ClassInfoTraitTest.php +++ b/tests/Util/ClassInfoTraitTest.php @@ -11,10 +11,10 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Util\ClassInfoTrait; use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy; +use ApiPlatform\Util\ClassInfoTrait; use PHPUnit\Framework\TestCase; class ClassInfoTraitTest extends TestCase diff --git a/tests/Core/Util/CloneTraitTest.php b/tests/Util/CloneTraitTest.php similarity index 92% rename from tests/Core/Util/CloneTraitTest.php rename to tests/Util/CloneTraitTest.php index 78929a12908..a2b94492f9d 100644 --- a/tests/Core/Util/CloneTraitTest.php +++ b/tests/Util/CloneTraitTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Util\CloneTrait; +use ApiPlatform\Util\CloneTrait; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Core/Util/ErrorFormatGuesserTest.php b/tests/Util/ErrorFormatGuesserTest.php similarity index 95% rename from tests/Core/Util/ErrorFormatGuesserTest.php rename to tests/Util/ErrorFormatGuesserTest.php index 6cb892310d4..1024001f830 100644 --- a/tests/Core/Util/ErrorFormatGuesserTest.php +++ b/tests/Util/ErrorFormatGuesserTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Util\ErrorFormatGuesser; +use ApiPlatform\Util\ErrorFormatGuesser; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/Util/IriHelperTest.php b/tests/Util/IriHelperTest.php similarity index 92% rename from tests/Core/Util/IriHelperTest.php rename to tests/Util/IriHelperTest.php index 7e4c3bbbbfb..a9104eaa4dc 100644 --- a/tests/Core/Util/IriHelperTest.php +++ b/tests/Util/IriHelperTest.php @@ -11,11 +11,11 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; use ApiPlatform\Core\Api\UrlGeneratorInterface; -use ApiPlatform\Core\Util\IriHelper; use ApiPlatform\Exception\InvalidArgumentException; +use ApiPlatform\Util\IriHelper; use PHPUnit\Framework\TestCase; /** @@ -42,7 +42,7 @@ public function testHelpers() /** * @group legacy - * @expectedDeprecation Passing a bool as 5th parameter to "ApiPlatform\Core\Util\IriHelper::createIri()" is deprecated since API Platform 2.6. Pass an "ApiPlatform\Core\Api\UrlGeneratorInterface" constant (int) instead. + * @expectedDeprecation Passing a bool as 5th parameter to "ApiPlatform\Util\IriHelper::createIri()" is deprecated since API Platform 2.6. Pass an "ApiPlatform\Core\Api\UrlGeneratorInterface" constant (int) instead. */ public function testLegacyHelpers() { @@ -63,7 +63,7 @@ public function testLegacyHelpers() /** * @group legacy - * @expectedDeprecation Passing a bool as 5th parameter to "ApiPlatform\Core\Util\IriHelper::createIri()" is deprecated since API Platform 2.6. Pass an "ApiPlatform\Core\Api\UrlGeneratorInterface" constant (int) instead. + * @expectedDeprecation Passing a bool as 5th parameter to "ApiPlatform\Util\IriHelper::createIri()" is deprecated since API Platform 2.6. Pass an "ApiPlatform\Core\Api\UrlGeneratorInterface" constant (int) instead. */ public function testLegacyHelpersWithAbsoluteUrl() { diff --git a/tests/Core/Util/ReflectionTest.php b/tests/Util/ReflectionTest.php similarity index 92% rename from tests/Core/Util/ReflectionTest.php rename to tests/Util/ReflectionTest.php index 40a27572d91..d59b395796f 100644 --- a/tests/Core/Util/ReflectionTest.php +++ b/tests/Util/ReflectionTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Util\Reflection; +use ApiPlatform\Util\Reflection; use PHPUnit\Framework\TestCase; /** diff --git a/tests/Util/RequestAttributesExtractorTest.php b/tests/Util/RequestAttributesExtractorTest.php new file mode 100644 index 00000000000..f37ab0d963b --- /dev/null +++ b/tests/Util/RequestAttributesExtractorTest.php @@ -0,0 +1,213 @@ + + * + * 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\Tests\Util; + +use ApiPlatform\Util\RequestAttributesExtractor; +use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpFoundation\Request; + +/** + * @author Kévin Dunglas + */ +class RequestAttributesExtractorTest extends TestCase +{ + public function testExtractCollectionAttributes() + { + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_collection_operation_name' => 'post']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'collection_operation_name' => 'post', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + } + + public function testExtractItemAttributes() + { + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + } + + public function testExtractReceive() + { + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_receive' => '0']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => false, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_receive' => '1']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + } + + public function testExtractRespond() + { + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_respond' => '0']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => false, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_respond' => '1']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + } + + public function testExtractPersist() + { + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_persist' => '0']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => false, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_persist' => '1']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + } + + public function testResourceClassNotSet() + { + $this->assertEmpty(RequestAttributesExtractor::extractAttributes(new Request([], [], ['_api_item_operation_name' => 'get']))); + } + + public function testOperationNotSet() + { + $this->assertEmpty(RequestAttributesExtractor::extractAttributes(new Request([], [], ['_api_resource_class' => 'Foo']))); + } + + public function testExtractPreviousDataAttributes() + { + $object = new \stdClass(); + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', 'previous_data' => $object]); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'previous_data' => $object, + 'identifiers' => ['id' => ['Foo', 'id']], + 'has_composite_identifier' => false, + ], RequestAttributesExtractor::extractAttributes($request)); + } + + public function testExtractIdentifiers() + { + $request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_identifiers' => ['test'], '_api_has_composite_identifier' => true]); + + $this->assertEquals([ + 'resource_class' => 'Foo', + 'item_operation_name' => 'get', + 'receive' => true, + 'respond' => true, + 'persist' => true, + 'identifiers' => ['test' => ['Foo', 'test']], + 'has_composite_identifier' => true, + ], RequestAttributesExtractor::extractAttributes($request)); + } +} diff --git a/tests/Core/Util/RequestParserTest.php b/tests/Util/RequestParserTest.php similarity index 95% rename from tests/Core/Util/RequestParserTest.php rename to tests/Util/RequestParserTest.php index 114e2241311..c5ae5d298f6 100644 --- a/tests/Core/Util/RequestParserTest.php +++ b/tests/Util/RequestParserTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Util\RequestParser; +use ApiPlatform\Util\RequestParser; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/Core/Util/SortTraitTest.php b/tests/Util/SortTraitTest.php similarity index 93% rename from tests/Core/Util/SortTraitTest.php rename to tests/Util/SortTraitTest.php index 4a924a13afa..d41afc6f770 100644 --- a/tests/Core/Util/SortTraitTest.php +++ b/tests/Util/SortTraitTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); -namespace ApiPlatform\Core\Tests\Util; +namespace ApiPlatform\Tests\Util; -use ApiPlatform\Core\Util\SortTrait; +use ApiPlatform\Util\SortTrait; use PHPUnit\Framework\TestCase; /** diff --git a/update-js.sh b/update-js.sh index e2f15e8b185..bbc621d6aac 100755 --- a/update-js.sh +++ b/update-js.sh @@ -4,7 +4,7 @@ rm -f yarn.lock yarn add @fontsource/open-sans swagger-ui-dist yarn add --production es6-promise fetch react react-dom graphiql graphql-playground-react@1.7.26 redoc -dest=src/Core/Bridge/Symfony/Bundle/Resources/public/fonts/open-sans/ +dest=src/Symfony/Bundle/Resources/public/fonts/open-sans/ if [[ -d "$dest" ]]; then rm -Rf "$dest" fi @@ -26,7 +26,7 @@ cp node_modules/@fontsource/open-sans/files/open-sans-vietnamese-700-normal.woff cp node_modules/@fontsource/open-sans/files/open-sans-latin-ext-700-normal.woff2 "${dest}files/" cp node_modules/@fontsource/open-sans/files/open-sans-latin-700-normal.woff2 "${dest}files/" -dest=src/Core/Bridge/Symfony/Bundle/Resources/public/swagger-ui/ +dest=src/Symfony/Bundle/Resources/public/swagger-ui/ if [[ -d "$dest" ]]; then rm -Rf "$dest" fi @@ -39,7 +39,7 @@ cp node_modules/swagger-ui-dist/swagger-ui.css "$dest" cp node_modules/swagger-ui-dist/swagger-ui.css.map "$dest" cp node_modules/swagger-ui-dist/oauth2-redirect.html "$dest" -dest=src/Core/Bridge/Symfony/Bundle/Resources/public/react/ +dest=src/Symfony/Bundle/Resources/public/react/ if [[ -d "$dest" ]]; then rm -Rf "$dest" fi @@ -47,7 +47,7 @@ mkdir -p "$dest" cp node_modules/react/umd/react.production.min.js "$dest" cp node_modules/react-dom/umd/react-dom.production.min.js "$dest" -dest=src/Core/Bridge/Symfony/Bundle/Resources/public/graphiql/ +dest=src/Symfony/Bundle/Resources/public/graphiql/ if [[ -d "$dest" ]]; then rm -Rf "$dest" fi @@ -55,7 +55,7 @@ mkdir -p "$dest" cp node_modules/graphiql/graphiql.min.js "$dest" cp node_modules/graphiql/graphiql.css "$dest" -dest=src/Core/Bridge/Symfony/Bundle/Resources/public/graphql-playground/ +dest=src/Symfony/Bundle/Resources/public/graphql-playground/ if [[ -d "$dest" ]]; then rm -Rf "$dest" fi @@ -63,7 +63,7 @@ mkdir -p "$dest" cp node_modules/graphql-playground-react/build/static/js/middleware.js "$dest" cp node_modules/graphql-playground-react/build/static/css/index.css "$dest" -dest=src/Core/Bridge/Symfony/Bundle/Resources/public/redoc/ +dest=src/Symfony/Bundle/Resources/public/redoc/ if [[ -d "$dest" ]]; then rm -Rf "$dest" fi