Move the non-legacy code to src (#4556)

* create depreacted interfaces file and move DataTransformer interfaces

* move validator

* fix interfaces and action alias

* Move ApiPlatform\Core\Bridge\Doctrine\Common\Filter traits

* move Action directory

* Util classes

* Validator, cs-fixer, WIP phpstan

* fix references & test

* revert code style & improve ApiPlatformExtensionTest

* Bridge/Doctrine

* Elasticsearch

* RamseyUuid

* DataProvider & DataTransformer

* Documentation

* EventListener

* Hal

* HttpCache

* Hydra

* Bridge\Symfony\Bundle

* Symfony/Messenger

* Symfony/Metadata

* Symfony/Routing

* Symfony/Validator

* Problem

* Serializer

* Test

* OpenApi + Swagger

* JsonApi

* JsonLd

* JsonSchema

* Security

* Mercure

* PathResolver

Co-authored-by: Kevin Verschaeve <[email protected]>
Co-authored-by: Jade Bellereau <[email protected]>
Co-authored-by: Florian Vaneste <[email protected]>

Author: 4 people

.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

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,46 +57,46 @@ parameters:
 		-
 			message: "#Parameter \\#2 \\$dqlPart of method Doctrine\\\\ORM\\\\QueryBuilder::add\\(\\) expects array<'join'\\|int, array<int\\|string, object>\\|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\(\)#'
 			path: src/Core/Bridge/Doctrine/Common/Util/IdentifierManagerTrait.php
 		# 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<bool\|float\|GraphQL\\Language\\AST\\Location\|GraphQL\\Language\\AST\\NameNode\|GraphQL\\Language\\AST\\NodeList\|GraphQL\\Language\\AST\\SelectionSetNode\|int\|string\|null>, array<string, .+> 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<mixed, mixed> 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
 		-
 			message: '#Parameter \#1 \$objectValue of method GraphQL\\Type\\Definition\\InterfaceType::resolveType\(\) expects object, array(<string, string>)? given.#'
 			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<ApiPlatform\\Tests\\Fixtures\\TestBundle\\Document\\Dummy>\.#'
-			path: src/Core/Test/DoctrineMongoDbOdmFilterTestCase.php
+			message: '#Property ApiPlatform\\Test\\DoctrineMongoDbOdmFilterTestCase::\$repository \(Doctrine\\ODM\\MongoDB\\Repository\\DocumentRepository\) does not accept Doctrine\\ORM\\EntityRepository<ApiPlatform\\Tests\\Fixtures\\TestBundle\\Document\\Dummy>\.#'
+			path: src/Test/DoctrineMongoDbOdmFilterTestCase.php
 		-
 			message: "#Call to method PHPUnit\\\\Framework\\\\Assert::assertSame\\(\\) with array\\('(collection_context|item_context|subresource_context)'\\) and array<Symfony\\\\Component\\\\VarDumper\\\\Cloner\\\\Data>\\|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

phpunit.xml.dist

@@ -34,8 +34,8 @@
             <directory>src/Bridge/Symfony/Maker/Resources/skeleton</directory>
             <directory>src/Core/Bridge/Rector</directory>
             <file>.php-cs-fixer.dist.php</file>
-            <file>src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php</file>
-            <file>src/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php</file>
+            <file>src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php</file>
+            <file>src/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php</file>
         </exclude>
     </coverage>
 

src/Core/Action/EntrypointAction.php src/Action/EntrypointAction.phpsrc/Core/Action/EntrypointAction.php renamed to 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;

src/Core/Action/ExceptionAction.php src/Action/ExceptionAction.phpsrc/Core/Action/ExceptionAction.php renamed to 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;

src/Core/Action/NotFoundAction.php src/Action/NotFoundAction.phpsrc/Core/Action/NotFoundAction.php renamed to 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;
 

src/Core/Action/PlaceholderAction.php src/Action/PlaceholderAction.phpsrc/Core/Action/PlaceholderAction.php renamed to 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.

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;
 

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.

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;