From 5367c31ea6c17e60d5f63638fc76c55830c9df21 Mon Sep 17 00:00:00 2001
From: Tomas <norkunas.tom@gmail.com>
Date: Wed, 11 Oct 2017 18:07:01 +0300
Subject: [PATCH] Throw on abstract data providers / filters

---
 .../Bundle/DependencyInjection/Compiler/DataProviderPass.php  | 4 ++--
 .../Bundle/DependencyInjection/Compiler/FilterPass.php        | 2 +-
 .../Bundle/DependencyInjection/Compiler/FilterPassTest.php    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php
index f3033718a90..4800fc5cada 100644
--- 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
index 0fa13a95985..9ad49e05db4 100644
--- 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
index 652a793840d..7bc4e4a3d4a 100644
--- 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();