chore(test): move fixtures and tests

Author: soyuka

composer.json

@@ -118,7 +118,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "ApiPlatform\\Core\\Tests\\": "tests/",
+            "ApiPlatform\\Core\\Tests\\": "tests/Core/",
+            "ApiPlatform\\Tests\\": "tests/",
             "App\\": "tests/Fixtures/app/var/tmp/src/"
         }
     },

features/doctrine/eager_loading.feature

@@ -12,7 +12,7 @@ Feature: Eager Loading
     And the DQL should be equal to:
     """
     SELECT o, thirdLevel_a1, relatedToDummyFriend_a2, dummyFriend_a3
-    FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
+    FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
         LEFT JOIN o.thirdLevel thirdLevel_a1
         LEFT JOIN o.relatedToDummyFriend relatedToDummyFriend_a2
         LEFT JOIN relatedToDummyFriend_a2.dummyFriend dummyFriend_a3
@@ -26,12 +26,12 @@ Feature: Eager Loading
     And the DQL should be equal to:
     """
     SELECT o
-    FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy o
+    FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy o
         INNER JOIN o.relatedDummy relatedDummy_a1
         INNER JOIN relatedDummy_a1.thirdLevel thirdLevel_a2
     WHERE o IN(
             SELECT o_a3
-            FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy o_a3
+            FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy o_a3
                 INNER JOIN o_a3.relatedDummy relatedDummy_a4
                 INNER JOIN relatedDummy_a4.thirdLevel thirdLevel_a5
             WHERE thirdLevel_a5.level = :level_p1
@@ -46,13 +46,13 @@ Feature: Eager Loading
     And the DQL should be equal to:
     """
     SELECT o, thirdLevel_a4, relatedToDummyFriend_a1, dummyFriend_a5
-    FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
+    FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
         INNER JOIN o.relatedToDummyFriend relatedToDummyFriend_a1
         LEFT JOIN o.thirdLevel thirdLevel_a4
         INNER JOIN relatedToDummyFriend_a1.dummyFriend dummyFriend_a5
     WHERE o IN(
             SELECT o_a2
-            FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy o_a2
+            FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o_a2
                 INNER JOIN o_a2.relatedToDummyFriend relatedToDummyFriend_a3
             WHERE relatedToDummyFriend_a3.dummyFriend = :dummyFriend_p1
         )
@@ -69,7 +69,7 @@ Feature: Eager Loading
     And the DQL should be equal to:
     """
     SELECT o, car_a1, passenger_a2
-    FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyTravel o
+    FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyTravel o
         LEFT JOIN o.car car_a1
         LEFT JOIN o.passenger passenger_a2
     WHERE o.id = :id_id
@@ -82,13 +82,13 @@ Feature: Eager Loading
     And the DQL should be equal to:
     """
     SELECT o, thirdLevel_a3, relatedToDummyFriend_a4, dummyFriend_a5
-    FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
+    FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy o
         LEFT JOIN o.thirdLevel thirdLevel_a3
         LEFT JOIN o.relatedToDummyFriend relatedToDummyFriend_a4
         LEFT JOIN relatedToDummyFriend_a4.dummyFriend dummyFriend_a5
     WHERE o.id IN (
             SELECT related_dummy_a1.id
-            FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy related_dummy_a1
+            FROM ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy related_dummy_a1
             INNER JOIN related_dummy_a1.relatedToDummyFriend related_to_dummy_friend_a2
             WITH related_to_dummy_friend_a2.name = :name_p1
         )

features/main/relation.feature

@@ -502,7 +502,7 @@ Feature: Relations support
           "pattern": "^An error occurred$"
         },
         "hydra:description": {
-          "pattern": "^Expected IRI or document for resource \"ApiPlatform\\\\Core\\\\Tests\\\\Fixtures\\\\TestBundle\\\\(Document|Entity)\\\\RelatedDummy\", \"integer\" given.$"
+          "pattern": "^Expected IRI or document for resource \"ApiPlatform\\\\Tests\\\\Fixtures\\\\TestBundle\\\\(Document|Entity)\\\\RelatedDummy\", \"integer\" given.$"
         }
       },
       "required": [

features/serializer/vo_relations.feature

@@ -135,7 +135,7 @@ Feature: Value object as ApiResource
           "pattern": "^An error occurred$"
         },
         "hydra:description": {
-          "pattern": "^Cannot create an instance of ApiPlatform\\\\Core\\\\Tests\\\\Fixtures\\\\TestBundle\\\\(Document|Entity)\\\\VoDummyCar from serialized data because its constructor requires parameter \"drivers\" to be present.$"
+          "pattern": "^Cannot create an instance of ApiPlatform\\\\Tests\\\\Fixtures\\\\TestBundle\\\\(Document|Entity)\\\\VoDummyCar from serialized data because its constructor requires parameter \"drivers\" to be present.$"
         }
       },
       "required": [

phpstan.neon.dist

@@ -18,23 +18,23 @@ parameters:
 		- tests/Fixtures/app/var/cache
 		# Deprecated integrations (will be removed in API Platform 3)
 		- src/Core/Bridge/NelmioApiDoc/*
-		- tests/Bridge/NelmioApiDoc/*
+		- tests/Core/Bridge/NelmioApiDoc/*
 		- src/Core/Bridge/FosUser/*
 		# BC layer
-		- tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPassTest.php
-		- tests/Annotation/ApiResourceTest.php
-		- tests/Annotation/ApiPropertyTest.php
-		- tests/Metadata/Resource/Factory/AnnotationResourceMetadataFactoryTest.php
+		- tests/Core/Bridge/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
 		# Phpstan runs on phpunit > 9, a signature changed in this file
 		- src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php
 		# Imported code (temporary)
 		- src/Core/Bridge/Symfony/Bundle/Test/BrowserKitAssertionsTrait.php
-		- tests/Bridge/Symfony/Bundle/Test/WebTestCaseTest.php
-		- tests/ProphecyTrait.php
-		- tests/Behat/CoverageContext.php
+		- tests/Core/Bridge/Symfony/Bundle/Test/WebTestCaseTest.php
+		- tests/Core/ProphecyTrait.php
+		- tests/Core/Behat/CoverageContext.php
 		- tests/Fixtures/TestBundle/Security/AbstractSecurityUser.php
 		# Templates for Maker
 		- src/Core/Bridge/Symfony/Maker/Resources/skeleton
@@ -53,7 +53,7 @@ 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/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php
+				- tests/Core/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php
 		- '#Parameter \#1 \$function of function call_user_func expects callable\(\): mixed, non-empty-string given\.#'
 		-
 			message: '#Strict comparison using !== between .+ and .+ will always evaluate to false\.#'
@@ -73,27 +73,27 @@ parameters:
 		-
 			message: '#Parameter \#[0-9] \$filterLocator of class .+ constructor expects ApiPlatform\\Core\\Api\\FilterCollection|Psr\\Container\\ContainerInterface, ArrayObject<mixed, mixed> given\.#'
 			paths:
-				- tests/Bridge/Doctrine/Orm/Extension/FilterExtensionTest.php
-				- tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php
-				- tests/Swagger/Serializer/DocumentationNormalizerV2Test.php
-				- tests/Swagger/Serializer/DocumentationNormalizerV3Test.php
+				- tests/Core/Bridge/Doctrine/Orm/Extension/FilterExtensionTest.php
+				- tests/Core/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\\Core\\Tests\\Fixtures\\TestBundle\\Document\\Dummy>\.#'
+			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: "#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/Bridge/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php
+			path: tests/Core/Bridge/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/Identifier/Normalizer/IntegerDenormalizerTest.php
+			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/Util/SortTraitTest.php
+			path: tests/Core/Util/SortTraitTest.php
 		# https://github.com/phpstan/phpstan-symfony/issues/76
 		-
 			message: '#Service "test" is not registered in the container\.#'
@@ -124,4 +124,4 @@ parameters:
 		# 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/JsonApi/Serializer/ItemNormalizerTest.php
+			path: tests/Core/JsonApi/Serializer/ItemNormalizerTest.php

tests/Action/EntrypointActionTest.php renamed to tests/Core/Action/EntrypointActionTest.php

@@ -14,8 +14,8 @@
 namespace ApiPlatform\Core\Tests\Annotation;
 
 use ApiPlatform\Core\Annotation\ApiFilter;
-use ApiPlatform\Core\Tests\Fixtures\DummyFilter;
-use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
+use ApiPlatform\Tests\Fixtures\DummyFilter;
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -34,7 +34,7 @@ public function testInvalidConstructor()
     public function testInvalidFilter()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The filter class "ApiPlatform\\Core\\Tests\\Fixtures\\TestBundle\\Entity\\Dummy" does not implement "ApiPlatform\\Core\\Api\\FilterInterface". Did you forget a use statement?');
+        $this->expectExceptionMessage('The filter class "ApiPlatform\\Tests\\Fixtures\\TestBundle\\Entity\\Dummy" does not implement "ApiPlatform\\Core\\Api\\FilterInterface". Did you forget a use statement?');
 
         new ApiFilter(['value' => Dummy::class]); // @phpstan-ignore-line
     }
@@ -63,7 +63,7 @@ public function testAssignation()
     public function testAssignationAttribute()
     {
         $filter = eval(<<<'PHP'
-return new \ApiPlatform\Core\Annotation\ApiFilter(\ApiPlatform\Core\Tests\Fixtures\DummyFilter::class, strategy: 'test', properties: ['one', 'two'], arguments: ['args']);
+return new \ApiPlatform\Core\Annotation\ApiFilter(\ApiPlatform\Tests\Fixtures\DummyFilter::class, strategy: 'test', properties: ['one', 'two'], arguments: ['args']);
 PHP
 );