Merge pull request #1418 from norkunas/patch-3

Throw on abstract data providers / filters
api-platform · Oct 12, 2017 · 98d0ce8 · 98d0ce8
2 parents 19671b8 + 5367c31
commit 98d0ce8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
      */
     private function registerDataProviders(ContainerBuilder $container, string $type)
     {
-        $services = $container->findTaggedServiceIds('api_platform.'.$type.'_data_provider');
+        $services = $container->findTaggedServiceIds("api_platform.{$type}_data_provider", true);
 
         $queue = new \SplPriorityQueue();
 
@@ -58,6 +58,6 @@ private function registerDataProviders(ContainerBuilder $container, string $type
             }
         }
 
-        $container->getDefinition('api_platform.'.$type.'_data_provider')->addArgument(iterator_to_array($queue, false));
+        $container->getDefinition("api_platform.{$type}_data_provider")->addArgument(iterator_to_array($queue, false));
     }
 }
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPass.php
@@ -35,7 +35,7 @@ final class FilterPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $filters = [];
-        foreach ($container->findTaggedServiceIds('api_platform.filter') as $serviceId => $tags) {
+        foreach ($container->findTaggedServiceIds('api_platform.filter', true) as $serviceId => $tags) {
             foreach ($tags as $tag) {
                 if (!isset($tag['id'])) {
                     $tag['id'] = $serviceId;

diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/FilterPassTest.php
@@ -40,7 +40,7 @@ public function testProcess()
         $filterCollectionFactoryDefinitionProphecy->addArgument(['my_id'])->shouldBeCalled();
 
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->findTaggedServiceIds('api_platform.filter')->willReturn(['foo' => [], 'bar' => [['id' => 'my_id']]])->shouldBeCalled();
+        $containerBuilderProphecy->findTaggedServiceIds('api_platform.filter', true)->willReturn(['foo' => [], 'bar' => [['id' => 'my_id']]])->shouldBeCalled();
         $containerBuilderProphecy->getDefinition('api_platform.filter_locator')->willReturn($filterLocatorDefinitionProphecy->reveal())->shouldBeCalled();
         $containerBuilderProphecy->getDefinition('api_platform.filter_collection_factory')->willReturn($filterCollectionFactoryDefinitionProphecy->reveal())->shouldBeCalled();
 
@@ -62,7 +62,7 @@ public function testIdNotExist()
         $filterCollectionFactoryDefinitionProphecy->addArgument(['bar'])->shouldBeCalled();
 
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->findTaggedServiceIds('api_platform.filter')->willReturn(['foo' => [], 'bar' => [['hi' => 'hello']]])->shouldBeCalled();
+        $containerBuilderProphecy->findTaggedServiceIds('api_platform.filter', true)->willReturn(['foo' => [], 'bar' => [['hi' => 'hello']]])->shouldBeCalled();
         $containerBuilderProphecy->getDefinition('api_platform.filter_locator')->willReturn($filterLocatorDefinitionProphecy->reveal())->shouldBeCalled();
         $containerBuilderProphecy->getDefinition('api_platform.filter_collection_factory')->willReturn($filterCollectionFactoryDefinitionProphecy->reveal())->shouldBeCalled();