Merge pull request #4827 from dannyvw/core-namespace

vincentchalamon · web-flow · commit cffe6fe3f550 · 2022-07-20T20:40:46.000+02:00
Remove core namespace leftovers
diff --git a/src/Api/FilterInterface.php b/src/Api/FilterInterface.php
@@ -45,7 +45,7 @@ interface FilterInterface
      *     ]
      * The description can contain additional data specific to a filter.
      *
-     * @see \ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer::getFiltersParameters
+     * @see \ApiPlatform\OpenApi\Factory\OpenApiFactory::getFiltersParameters
      */
     public function getDescription(string $resourceClass): array;
 }
diff --git a/src/Api/QueryParameterValidator/Validator/ValidatorInterface.php b/src/Api/QueryParameterValidator/Validator/ValidatorInterface.php
@@ -17,7 +17,7 @@ interface ValidatorInterface
 {
     /**
      * @param string               $name              the parameter name to validate
-     * @param array<string, mixed> $filterDescription the filter descriptions as returned by `ApiPlatform\Core\Api\FilterInterface::getDescription()`
+     * @param array<string, mixed> $filterDescription the filter descriptions as returned by `\ApiPlatform\Api\FilterInterface::getDescription()`
      * @param array<string, mixed> $queryParameters   the list of query parameter
      */
     public function validate(string $name, array $filterDescription, array $queryParameters): array;
diff --git a/src/JsonSchema/TypeFactory.php b/src/JsonSchema/TypeFactory.php
@@ -41,12 +41,7 @@ public function __construct(ResourceClassResolverInterface $resourceClassResolve
         $this->resourceClassResolver = $resourceClassResolver;
     }
 
-    /**
-     * SchemaFactoryInterface|LegacySchemaFactoryInterface.
-     *
-     * @param mixed $schemaFactory
-     */
-    public function setSchemaFactory($schemaFactory): void
+    public function setSchemaFactory(SchemaFactoryInterface $schemaFactory): void
     {
         $this->schemaFactory = $schemaFactory;
     }
diff --git a/src/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php b/src/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php
@@ -46,6 +46,5 @@ public function process(ContainerBuilder $container)
         }
 
         $container->getDefinition('api_platform.filter_locator')->addArgument($filters);
-        $container->getDefinition('api_platform.filter_collection_factory')->addArgument(array_keys($filters));
     }
 }
diff --git a/src/Symfony/Bundle/Resources/config/api.xml b/src/Symfony/Bundle/Resources/config/api.xml
@@ -15,15 +15,6 @@
         </service>
         <service id="ApiPlatform\Api\ResourceClassResolverInterface" alias="api_platform.resource_class_resolver" />
 
-        <service id="api_platform.route_name_resolver" class="ApiPlatform\Core\Bridge\Symfony\Routing\RouteNameResolver" public="false">
-            <argument type="service" id="api_platform.router" />
-        </service>
-
-        <service id="api_platform.route_name_resolver.cached" class="ApiPlatform\Core\Bridge\Symfony\Routing\CachedRouteNameResolver" decorates="api_platform.route_name_resolver" decoration-priority="-10" public="false">
-            <argument type="service" id="api_platform.cache.route_name_resolver" />
-            <argument type="service" id="api_platform.route_name_resolver.cached.inner" />
-        </service>
-
         <service id="ApiPlatform\Api\UrlGeneratorInterface" alias="api_platform.router" />
 
         <service id="api_platform.router" class="ApiPlatform\Symfony\Routing\Router" public="false">
diff --git a/src/Symfony/Bundle/Resources/config/filter.xml b/src/Symfony/Bundle/Resources/config/filter.xml
@@ -10,13 +10,6 @@
         <service id="api_platform.filter_locator" class="Symfony\Component\DependencyInjection\ServiceLocator">
             <tag name="container.service_locator" />
         </service>
-
-        <service id="api_platform.filter_collection_factory" class="ApiPlatform\Core\Api\FilterCollectionFactory" />
-
-        <service id="api_platform.filters" class="ApiPlatform\Core\Api\FilterCollection">
-            <factory service="api_platform.filter_collection_factory" method="createFilterCollectionFromLocator" />
-            <argument type="service" id="api_platform.filter_locator" />
-        </service>
     </services>
 
 </container>
diff --git a/src/Symfony/Bundle/Resources/config/metadata/property_name.xml b/src/Symfony/Bundle/Resources/config/metadata/property_name.xml
@@ -9,7 +9,6 @@
 
         <service id="api_platform.metadata.property.name_collection_factory" alias="api_platform.metadata.property.name_collection_factory.property_info" />
         <service id="ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface" alias="api_platform.metadata.property.name_collection_factory" />
-        <service id="ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface" alias="api_platform.metadata.property.name_collection_factory" />
 
         <service id="api_platform.metadata.property.name_collection_factory.property_info" class="ApiPlatform\Metadata\Property\Factory\PropertyInfoPropertyNameCollectionFactory" public="false">
             <argument type="service" id="api_platform.property_info" />
diff --git a/src/Symfony/Bundle/Resources/config/ramsey_uuid.xml b/src/Symfony/Bundle/Resources/config/ramsey_uuid.xml
@@ -5,10 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="api_platform.identifier.uuid_normalizer" class="ApiPlatform\Core\Bridge\RamseyUuid\Identifier\Normalizer\UuidNormalizer" public="false">
-            <tag name="api_platform.identifier.denormalizer" priority="-100" />
-        </service>
-
         <service id="api_platform.serializer.uuid_denormalizer" class="ApiPlatform\RamseyUuid\Serializer\UuidDenormalizer" public="false">
             <tag name="serializer.normalizer" />
         </service>
diff --git a/src/Symfony/Bundle/Resources/config/symfony/uid.xml b/src/Symfony/Bundle/Resources/config/symfony/uid.xml
@@ -5,14 +5,6 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="api_platform.identifier.symfony_ulid_normalizer" class="ApiPlatform\Core\Bridge\Symfony\Identifier\Normalizer\UlidNormalizer" public="false">
-            <tag name="api_platform.identifier.denormalizer" />
-        </service>
-
-        <service id="api_platform.identifier.symfony_uuid_normalizer" class="ApiPlatform\Core\Bridge\Symfony\Identifier\Normalizer\UuidNormalizer" public="false">
-            <tag name="api_platform.identifier.denormalizer" />
-        </service>
-
         <service id="api_platform.symfony.uri_variables.transformer.ulid" class="ApiPlatform\Symfony\UriVariableTransformer\UlidUriVariableTransformer" public="false">
             <tag name="api_platform.uri_variables.transformer" />
         </service>
diff --git a/tests/Doctrine/Orm/PaginatorTest.php b/tests/Doctrine/Orm/PaginatorTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm;
+namespace ApiPlatform\Tests\Doctrine\Orm;
 
 use ApiPlatform\Doctrine\Orm\Paginator;
 use ApiPlatform\Exception\InvalidArgumentException;
diff --git a/tests/Elasticsearch/PaginatorTest.php b/tests/Elasticsearch/PaginatorTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Bridge\Elasticsearch\DataProvider;
+namespace ApiPlatform\Tests\Elasticsearch\DataProvider;
 
 use ApiPlatform\Elasticsearch\Paginator;
 use ApiPlatform\Elasticsearch\Serializer\DocumentNormalizer;
diff --git a/tests/Elasticsearch/State/CollectionProviderTest.php b/tests/Elasticsearch/State/CollectionProviderTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Elasticsearch\State;
+namespace ApiPlatform\Tests\Elasticsearch\State;
 
 use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface;
 use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata;
diff --git a/tests/Fixtures/AnnotatedClass.php b/tests/Fixtures/AnnotatedClass.php
diff --git a/tests/Fixtures/TestBundle/Entity/DummyForAdditionalFieldsInput.php b/tests/Fixtures/TestBundle/Entity/DummyForAdditionalFieldsInput.php
@@ -13,15 +13,13 @@
 
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity;
 
-use ApiPlatform\Core\Annotation\ApiProperty;
+use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 
 #[ApiResource]
 final class DummyForAdditionalFieldsInput
 {
-    /**
-     * #[ApiProperty(identifier: true)].
-     */
+    #[ApiProperty(identifier: true)]
     public $id;
 
     public function __construct(private readonly string $dummyName)
diff --git a/tests/GraphQl/Action/GraphQlPlaygroundActionTest.php b/tests/GraphQl/Action/GraphQlPlaygroundActionTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Action;
+namespace ApiPlatform\Tests\GraphQl\Action;
 
 use ApiPlatform\GraphQl\Action\GraphQlPlaygroundAction;
 use ApiPlatform\Tests\ProphecyTrait;
diff --git a/tests/GraphQl/Action/GraphiQlActionTest.php b/tests/GraphQl/Action/GraphiQlActionTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Action;
+namespace ApiPlatform\Tests\GraphQl\Action;
 
 use ApiPlatform\GraphQl\Action\GraphiQlAction;
 use ApiPlatform\Tests\ProphecyTrait;
diff --git a/tests/GraphQl/Resolver/Factory/ItemResolverFactoryTest.php b/tests/GraphQl/Resolver/Factory/ItemResolverFactoryTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Factory;
+namespace ApiPlatform\Tests\GraphQl\Resolver\Factory;
 
 use ApiPlatform\GraphQl\Resolver\Factory\ItemResolverFactory;
 use ApiPlatform\GraphQl\Resolver\Stage\ReadStageInterface;
diff --git a/tests/GraphQl/Resolver/ResourceFieldResolverTest.php b/tests/GraphQl/Resolver/ResourceFieldResolverTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Resolver;
+namespace ApiPlatform\Tests\GraphQl\Resolver;
 
 use ApiPlatform\Api\IriConverterInterface;
 use ApiPlatform\Api\UrlGeneratorInterface;
diff --git a/tests/GraphQl/Resolver/Stage/WriteStageTest.php b/tests/GraphQl/Resolver/Stage/WriteStageTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Stage;
+namespace ApiPlatform\Tests\GraphQl\Resolver\Stage;
 
 use ApiPlatform\GraphQl\Resolver\Stage\WriteStage;
 use ApiPlatform\GraphQl\Serializer\SerializerContextBuilderInterface;
diff --git a/tests/GraphQl/Resolver/Util/IdentifierTraitTest.php b/tests/GraphQl/Resolver/Util/IdentifierTraitTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Resolver\Util;
+namespace ApiPlatform\Tests\GraphQl\Resolver\Util;
 
 use ApiPlatform\GraphQl\Resolver\Util\IdentifierTrait;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/GraphQl/Serializer/Exception/ErrorNormalizerTest.php b/tests/GraphQl/Serializer/Exception/ErrorNormalizerTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Serializer\Exception;
+namespace ApiPlatform\Tests\GraphQl\Serializer\Exception;
 
 use ApiPlatform\GraphQl\Serializer\Exception\ErrorNormalizer;
 use GraphQL\Error\Error;
diff --git a/tests/GraphQl/Serializer/Exception/RuntimeExceptionNormalizerTest.php b/tests/GraphQl/Serializer/Exception/RuntimeExceptionNormalizerTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Serializer\Exception;
+namespace ApiPlatform\Tests\GraphQl\Serializer\Exception;
 
 use ApiPlatform\GraphQl\Serializer\Exception\RuntimeExceptionNormalizer;
 use GraphQL\Error\Error;
diff --git a/tests/GraphQl/Serializer/Exception/ValidationExceptionNormalizerTest.php b/tests/GraphQl/Serializer/Exception/ValidationExceptionNormalizerTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Serializer\Exception;
+namespace ApiPlatform\Tests\GraphQl\Serializer\Exception;
 
 use ApiPlatform\GraphQl\Serializer\Exception\ValidationExceptionNormalizer;
 use ApiPlatform\Symfony\Validator\Exception\ValidationException;
diff --git a/tests/GraphQl/Serializer/ItemNormalizerTest.php b/tests/GraphQl/Serializer/ItemNormalizerTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Serializer;
+namespace ApiPlatform\Tests\GraphQl\Serializer;
 
 use ApiPlatform\Api\IdentifiersExtractorInterface;
 use ApiPlatform\Api\IriConverterInterface;
diff --git a/tests/GraphQl/Serializer/SerializerContextBuilderTest.php b/tests/GraphQl/Serializer/SerializerContextBuilderTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Serializer;
+namespace ApiPlatform\Tests\GraphQl\Serializer;
 
 use ApiPlatform\GraphQl\Serializer\SerializerContextBuilder;
 use ApiPlatform\Metadata\GraphQl\Mutation;
diff --git a/tests/GraphQl/Subscription/MercureSubscriptionIriGeneratorTest.php b/tests/GraphQl/Subscription/MercureSubscriptionIriGeneratorTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Subscription;
+namespace ApiPlatform\Tests\GraphQl\Subscription;
 
 use ApiPlatform\GraphQl\Subscription\MercureSubscriptionIriGenerator;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/GraphQl/Subscription/SubscriptionIdentifierGeneratorTest.php b/tests/GraphQl/Subscription/SubscriptionIdentifierGeneratorTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Subscription;
+namespace ApiPlatform\Tests\GraphQl\Subscription;
 
 use ApiPlatform\GraphQl\Subscription\SubscriptionIdentifierGenerator;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/GraphQl/Type/Definition/IterableTypeTest.php b/tests/GraphQl/Type/Definition/IterableTypeTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Type\Definition;
+namespace ApiPlatform\Tests\GraphQl\Type\Definition;
 
 use ApiPlatform\GraphQl\Type\Definition\IterableType;
 use GraphQL\Error\Error;
diff --git a/tests/GraphQl/Type/TypesContainerTest.php b/tests/GraphQl/Type/TypesContainerTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Type;
+namespace ApiPlatform\Tests\GraphQl\Type;
 
 use ApiPlatform\GraphQl\Type\TypeNotFoundException;
 use ApiPlatform\GraphQl\Type\TypesContainer;
diff --git a/tests/GraphQl/Type/TypesFactoryTest.php b/tests/GraphQl/Type/TypesFactoryTest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\GraphQl\Type;
+namespace ApiPlatform\Tests\GraphQl\Type;
 
 use ApiPlatform\GraphQl\Type\Definition\TypeInterface;
 use ApiPlatform\GraphQl\Type\TypesFactory;
diff --git a/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
@@ -201,10 +201,7 @@ public function testCommonConfiguration(): void
             'api_platform.action.not_found',
             'api_platform.action.placeholder',
             'api_platform.api.identifiers_extractor',
-            'api_platform.filter_collection_factory',
             'api_platform.filter_locator',
-            'api_platform.filters',
-            'api_platform.identifier.uuid_normalizer',
             'api_platform.negotiator',
             'api_platform.pagination',
             'api_platform.pagination_options',
@@ -213,8 +210,6 @@ public function testCommonConfiguration(): void
             'api_platform.ramsey_uuid.uri_variables.transformer.uuid',
             'api_platform.resource_class_resolver',
             'api_platform.route_loader',
-            'api_platform.route_name_resolver',
-            'api_platform.route_name_resolver.cached',
             'api_platform.router',
             'api_platform.serializer.context_builder',
             'api_platform.serializer.context_builder.filter',
@@ -263,7 +258,6 @@ public function testCommonConfiguration(): void
         $this->assertServiceHasTags('api_platform.filter_locator', ['container.service_locator']);
 
         // ramsey_uuid.xml
-        $this->assertServiceHasTags('api_platform.identifier.uuid_normalizer', ['api_platform.identifier.denormalizer']);
         $this->assertServiceHasTags('api_platform.serializer.uuid_denormalizer', ['serializer.normalizer']);
         $this->assertServiceHasTags('api_platform.ramsey_uuid.uri_variables.transformer.uuid', ['api_platform.uri_variables.transformer']);
 
@@ -283,16 +277,12 @@ public function testCommonConfigurationAbstractUid(): void
         (new ApiPlatformExtension())->load($config, $this->container);
 
         $services = [
-            'api_platform.identifier.symfony_ulid_normalizer',
-            'api_platform.identifier.symfony_uuid_normalizer',
             'api_platform.symfony.uri_variables.transformer.ulid',
             'api_platform.symfony.uri_variables.transformer.uuid',
         ];
 
         $this->assertContainerHas($services, []);
 
-        $this->assertServiceHasTags('api_platform.identifier.symfony_ulid_normalizer', ['api_platform.identifier.denormalizer']);
-        $this->assertServiceHasTags('api_platform.identifier.symfony_uuid_normalizer', ['api_platform.identifier.denormalizer']);
         $this->assertServiceHasTags('api_platform.symfony.uri_variables.transformer.ulid', ['api_platform.uri_variables.transformer']);
         $this->assertServiceHasTags('api_platform.symfony.uri_variables.transformer.uuid', ['api_platform.uri_variables.transformer']);
     }
@@ -388,15 +378,13 @@ public function testMetadataConfiguration(): void
             // metadata/property_name.xml
             'api_platform.metadata.property.name_collection_factory',
             'ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface',
-            'ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface',
 
             // metadata/property.xml
             'api_platform.metadata.property.identifier_metadata_factory',
 
             // metadata/property_name.xml
             'api_platform.metadata.property.name_collection_factory',
             'ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface',
-            'ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface',
 
             // metadata/resource.xml
             'api_platform.metadata.resource.metadata_collection_factory',
diff --git a/tests/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php b/tests/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ interface FilterInterface`
`45`	`45`	`* ]`
`46`	`46`	`* The description can contain additional data specific to a filter.`
`47`	`47`	`*`
`48`		`- * @see \ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer::getFiltersParameters`
	`48`	`+ * @see \ApiPlatform\OpenApi\Factory\OpenApiFactory::getFiltersParameters`
`49`	`49`	`*/`
`50`	`50`	`public function getDescription(string $resourceClass): array;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ interface ValidatorInterface`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @param string $name the parameter name to validate`
`20`		- * @param array<string, mixed> $filterDescription the filter descriptions as returned by `ApiPlatform\Core\Api\FilterInterface::getDescription()`
	`20`	+ * @param array<string, mixed> $filterDescription the filter descriptions as returned by `\ApiPlatform\Api\FilterInterface::getDescription()`
`21`	`21`	`* @param array<string, mixed> $queryParameters the list of query parameter`
`22`	`22`	`*/`
`23`	`23`	`public function validate(string $name, array $filterDescription, array $queryParameters): array;`
Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,7 @@ public function __construct(ResourceClassResolverInterface $resourceClassResolve`
`41`	`41`	`$this->resourceClassResolver = $resourceClassResolver;`
`42`	`42`	`}`
`43`	`43`
`44`		`- /**`
`45`		`- * SchemaFactoryInterface\|LegacySchemaFactoryInterface.`
`46`		`- *`
`47`		`- * @param mixed $schemaFactory`
`48`		`- */`
`49`		`- public function setSchemaFactory($schemaFactory): void`
	`44`	`+ public function setSchemaFactory(SchemaFactoryInterface $schemaFactory): void`
`50`	`45`	`{`
`51`	`46`	`$this->schemaFactory = $schemaFactory;`
`52`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,5 @@ public function process(ContainerBuilder $container)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$container->getDefinition('api_platform.filter_locator')->addArgument($filters);`
`49`		`- $container->getDefinition('api_platform.filter_collection_factory')->addArgument(array_keys($filters));`
`50`	`49`	`}`
`51`	`50`	`}`