Bump requirements to use tagged services

abluchet · abluchet · commit bc05cd879954 · 2018-04-05T11:52:56.000+02:00
diff --git a/composer.json b/composer.json
@@ -33,9 +33,9 @@
         "behat/symfony2-extension": "^2.1.1",
         "behatch/contexts": "^3.0@dev",
         "doctrine/annotations": "^1.2",
-        "doctrine/doctrine-bundle": "^1.6.3",
+        "doctrine/doctrine-bundle": "^1.8.0",
         "doctrine/orm": "^2.5.2",
-        "friendsofsymfony/user-bundle": "^2.0",
+        "friendsofsymfony/user-bundle": "^2.1",
         "guzzlehttp/guzzle": "^6.0",
         "justinrainbow/json-schema": "^5.0",
         "nelmio/api-doc-bundle": "^2.13.3",
@@ -45,26 +45,26 @@
         "phpunit/phpunit": "^6.1",
         "psr/log": "^1.0",
         "sensio/framework-extra-bundle": "^3.0.11 || ^4.0",
-        "symfony/asset": "^3.3 || ^4.0",
-        "symfony/cache": "^3.3 || ^4.0",
-        "symfony/config": "^3.3 || ^4.0",
-        "symfony/console": "^3.3 || ^4.0",
+        "symfony/asset": "^3.4 || ^4.0",
+        "symfony/cache": "^3.4 || ^4.0",
+        "symfony/config": "^3.4 || ^4.0",
+        "symfony/console": "^3.4 || ^4.0",
         "symfony/debug": "^2.8 || ^3.0 || ^4.0",
-        "symfony/dependency-injection": "^3.3 || ^4.0",
+        "symfony/dependency-injection": "^3.4 || ^4.0",
         "symfony/doctrine-bridge": "^2.8.12 || ^3.0 || ^4.0",
-        "symfony/event-dispatcher": "^3.3 || ^4.0",
+        "symfony/event-dispatcher": "^3.4 || ^4.0",
         "symfony/expression-language": "^2.8 || ^3.0 || ^4.0",
-        "symfony/finder": "^3.3 || ^4.0",
-        "symfony/form": "^3.3 || ^4.0",
-        "symfony/framework-bundle": "^3.3 || ^4.0",
-        "symfony/phpunit-bridge": "^3.3 || ^4.0",
-        "symfony/routing": "^3.3 || ^4.0",
-        "symfony/security": "^3.0 || ^4.0",
-        "symfony/security-bundle": "^3.0 || ^4.0",
-        "symfony/twig-bundle": "^3.1 || ^4.0",
-        "symfony/validator": "^3.3 || ^4.0",
-        "symfony/web-profiler-bundle": "^3.3 || ^4.0",
-        "symfony/yaml": "^3.3 || ^4.0",
+        "symfony/finder": "^3.4 || ^4.0",
+        "symfony/form": "^3.4 || ^4.0",
+        "symfony/framework-bundle": "^3.4 || ^4.0",
+        "symfony/phpunit-bridge": "^3.4 || ^4.0",
+        "symfony/routing": "^3.4 || ^4.0",
+        "symfony/security": "^3.4 || ^4.0",
+        "symfony/security-bundle": "^3.4 || ^4.0",
+        "symfony/twig-bundle": "^3.4 || ^4.0",
+        "symfony/validator": "^3.4 || ^4.0",
+        "symfony/web-profiler-bundle": "^3.4 || ^4.0",
+        "symfony/yaml": "^3.4 || ^4.0",
         "webonyx/graphql-php": "^0.10.2"
     },
     "conflict": {
diff --git a/src/Bridge/Doctrine/Orm/CollectionDataProvider.php b/src/Bridge/Doctrine/Orm/CollectionDataProvider.php
@@ -36,7 +36,7 @@ class CollectionDataProvider implements ContextAwareCollectionDataProviderInterf
     /**
      * @param QueryCollectionExtensionInterface[]|ContextAwareQueryCollectionExtensionInterface[] $collectionExtensions
      */
-    public function __construct(ManagerRegistry $managerRegistry, array $collectionExtensions = [])
+    public function __construct(ManagerRegistry $managerRegistry, \iterable $collectionExtensions = [])
     {
         $this->managerRegistry = $managerRegistry;
         $this->collectionExtensions = $collectionExtensions;
diff --git a/src/Bridge/Doctrine/Orm/ItemDataProvider.php b/src/Bridge/Doctrine/Orm/ItemDataProvider.php
@@ -46,7 +46,7 @@ class ItemDataProvider implements ItemDataProviderInterface, RestrictedDataProvi
      * @param PropertyMetadataFactoryInterface       $propertyMetadataFactory
      * @param QueryItemExtensionInterface[]          $itemExtensions
      */
-    public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, array $itemExtensions = [])
+    public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, \iterable $itemExtensions = [])
     {
         $this->managerRegistry = $managerRegistry;
         $this->propertyNameCollectionFactory = $propertyNameCollectionFactory;
diff --git a/src/Bridge/Doctrine/Orm/SubresourceDataProvider.php b/src/Bridge/Doctrine/Orm/SubresourceDataProvider.php
@@ -50,7 +50,7 @@ final class SubresourceDataProvider implements SubresourceDataProviderInterface
      * @param QueryCollectionExtensionInterface[]    $collectionExtensions
      * @param QueryItemExtensionInterface[]          $itemExtensions
      */
-    public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, array $collectionExtensions = [], array $itemExtensions = [])
+    public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, \iterable $collectionExtensions = [], \iterable $itemExtensions = [])
     {
         $this->managerRegistry = $managerRegistry;
         $this->propertyNameCollectionFactory = $propertyNameCollectionFactory;
diff --git a/src/Bridge/Symfony/Bundle/ApiPlatformBundle.php b/src/Bridge/Symfony/Bundle/ApiPlatformBundle.php
@@ -14,9 +14,7 @@
 namespace ApiPlatform\Core\Bridge\Symfony\Bundle;
 
 use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass;
-use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataPersisterPass;
 use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass;
-use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DoctrineQueryExtensionPass;
 use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\FilterPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -35,10 +33,8 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        $container->addCompilerPass(new DataPersisterPass());
         $container->addCompilerPass(new DataProviderPass());
         $container->addCompilerPass(new AnnotationFilterPass());
         $container->addCompilerPass(new FilterPass());
-        $container->addCompilerPass(new DoctrineQueryExtensionPass());
     }
 }
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataPersisterPass.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataPersisterPass.php
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DoctrineQueryExtensionPass.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DoctrineQueryExtensionPass.php
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/data_persister.xml b/src/Bridge/Symfony/Bundle/Resources/config/data_persister.xml
@@ -5,7 +5,9 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="api_platform.data_persister" class="ApiPlatform\Core\DataPersister\ChainDataPersister" public="false" />
+        <service id="api_platform.data_persister" class="ApiPlatform\Core\DataPersister\ChainDataPersister" public="false">
+                <argument type="tagged" tag="api_platform.data_persister" />
+        </service>
         <service id="ApiPlatform\Core\DataPersister\DataPersisterInterface" alias="api_platform.data_persister" />
     </services>
 
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml b/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml
@@ -17,22 +17,22 @@
 
         <service id="api_platform.doctrine.orm.collection_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine" />
-            <argument type="collection" /> <!-- extensions -->
+            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.collection" />
         </service>
 
         <service id="api_platform.doctrine.orm.item_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />
-            <argument type="collection" /> <!-- extensions -->
+            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.item" />
         </service>
 
         <service id="api_platform.doctrine.orm.subresource_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />
-            <argument type="collection" /> <!-- extensions -->
-            <argument type="collection" /> <!-- extensions -->
+            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.collection" />
+            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.item" />
         </service>
 
         <service id="api_platform.doctrine.orm.default.collection_data_provider" parent="api_platform.doctrine.orm.collection_data_provider" class="ApiPlatform\Core\Bridge\Doctrine\Orm\CollectionDataProvider">
diff --git a/tests/Bridge/Symfony/Bundle/ApiPlatformBundleTest.php b/tests/Bridge/Symfony/Bundle/ApiPlatformBundleTest.php
@@ -15,9 +15,7 @@
 
 use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle;
 use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass;
-use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataPersisterPass;
 use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass;
-use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DoctrineQueryExtensionPass;
 use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\FilterPass;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -34,8 +32,6 @@ public function testBuild()
         $containerProphecy->addCompilerPass(Argument::type(DataProviderPass::class))->shouldBeCalled();
         $containerProphecy->addCompilerPass(Argument::type(AnnotationFilterPass::class))->shouldBeCalled();
         $containerProphecy->addCompilerPass(Argument::type(FilterPass::class))->shouldBeCalled();
-        $containerProphecy->addCompilerPass(Argument::type(DoctrineQueryExtensionPass::class))->shouldBeCalled();
-        $containerProphecy->addCompilerPass(Argument::type(DataPersisterPass::class))->shouldBeCalled();
 
         $bundle = new ApiPlatformBundle();
         $bundle->build($containerProphecy->reveal());
diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataPersisterPassTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataPersisterPassTest.php
diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DoctrineQueryExtensionPassTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DoctrineQueryExtensionPassTest.php

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class CollectionDataProvider implements ContextAwareCollectionDataProviderInterf`
`36`	`36`	`/**`
`37`	`37`	`* @param QueryCollectionExtensionInterface[]\|ContextAwareQueryCollectionExtensionInterface[] $collectionExtensions`
`38`	`38`	`*/`
`39`		`- public function __construct(ManagerRegistry $managerRegistry, array $collectionExtensions = [])`
	`39`	`+ public function __construct(ManagerRegistry $managerRegistry, \iterable $collectionExtensions = [])`
`40`	`40`	`{`
`41`	`41`	`$this->managerRegistry = $managerRegistry;`
`42`	`42`	`$this->collectionExtensions = $collectionExtensions;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ItemDataProvider implements ItemDataProviderInterface, RestrictedDataProvi`
`46`	`46`	`* @param PropertyMetadataFactoryInterface $propertyMetadataFactory`
`47`	`47`	`* @param QueryItemExtensionInterface[] $itemExtensions`
`48`	`48`	`*/`
`49`		`- public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, array $itemExtensions = [])`
	`49`	`+ public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, \iterable $itemExtensions = [])`
`50`	`50`	`{`
`51`	`51`	`$this->managerRegistry = $managerRegistry;`
`52`	`52`	`$this->propertyNameCollectionFactory = $propertyNameCollectionFactory;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ final class SubresourceDataProvider implements SubresourceDataProviderInterface`
`50`	`50`	`* @param QueryCollectionExtensionInterface[] $collectionExtensions`
`51`	`51`	`* @param QueryItemExtensionInterface[] $itemExtensions`
`52`	`52`	`*/`
`53`		`- public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, array $collectionExtensions = [], array $itemExtensions = [])`
	`53`	`+ public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, \iterable $collectionExtensions = [], \iterable $itemExtensions = [])`
`54`	`54`	`{`
`55`	`55`	`$this->managerRegistry = $managerRegistry;`
`56`	`56`	`$this->propertyNameCollectionFactory = $propertyNameCollectionFactory;`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,7 @@`
`14`	`14`	`namespace ApiPlatform\Core\Bridge\Symfony\Bundle;`
`15`	`15`
`16`	`16`	`use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\AnnotationFilterPass;`
`17`		`-use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataPersisterPass;`
`18`	`17`	`use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DataProviderPass;`
`19`		`-use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\DoctrineQueryExtensionPass;`
`20`	`18`	`use ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler\FilterPass;`
`21`	`19`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`22`	`20`	`use Symfony\Component\HttpKernel\Bundle\Bundle;`
`@@ -35,10 +33,8 @@ public function build(ContainerBuilder $container)`
`35`	`33`	`{`
`36`	`34`	`parent::build($container);`
`37`	`35`
`38`		`- $container->addCompilerPass(new DataPersisterPass());`
`39`	`36`	`$container->addCompilerPass(new DataProviderPass());`
`40`	`37`	`$container->addCompilerPass(new AnnotationFilterPass());`
`41`	`38`	`$container->addCompilerPass(new FilterPass());`
`42`		`- $container->addCompilerPass(new DoctrineQueryExtensionPass());`
`43`	`39`	`}`
`44`	`40`	`}`