Merge pull request #1394 from stof/fix_config

Fix support for decorating persister services

Author: stof

src/DependencyInjection/Compiler/RegisterPagerPersistersPass.php

@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)
         $registry = $container->getDefinition('fos_elastica.pager_persister_registry');
 
         $nameToServiceIdMap = [];
-        foreach ($container->findTaggedServiceIds('fos_elastica.pager_persister') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('fos_elastica.pager_persister', true) as $id => $attributes) {
             foreach ($attributes as $attribute) {
                 if (!isset($attribute['persisterName'])) {
                     throw new \InvalidArgumentException(sprintf('Elastica pager persister "%s" must specify the "persisterName" attribute.', $id));
@@ -47,10 +47,14 @@ public function process(ContainerBuilder $container)
                 }
 
                 $persisterDef = $container->getDefinition($id);
-                if (!$persisterDef->getFactory()) {
+                if (!$persisterDef->getFactory() && $persisterDef->getClass()) {
                     // You are on your own if you use a factory to create a persister.
                     // It would fail in runtime if the factory does not return a proper persister.
-                    $this->assertClassImplementsPagerPersisterInterface($id, $persisterDef->getClass());
+                    $this->assertClassImplementsPagerPersisterInterface($id, $container->getParameterBag()->resolveValue($persisterDef->getClass()));
+                }
+
+                if (!$persisterDef->isPublic()) {
+                    throw new \InvalidArgumentException(sprintf('Elastica pager persister "%s" must be a public service', $id));
                 }
 
                 $nameToServiceIdMap[$persisterName] = $id;
@@ -79,4 +83,4 @@ private function assertClassImplementsPagerPersisterInterface($persisterId, $per
             ));
         }
     }
-}
+}

src/DependencyInjection/Compiler/RegisterPagerProvidersPass.php

@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
         $registry = $container->getDefinition('fos_elastica.pager_provider_registry');
 
         $registeredProviders = [];
-        foreach ($container->findTaggedServiceIds('fos_elastica.pager_provider') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('fos_elastica.pager_provider', true) as $id => $attributes) {
             foreach ($attributes as $attribute) {
                 if (!isset($attribute['type'])) {
                     throw new \InvalidArgumentException(sprintf('Elastica provider "%s" must specify the "type" attribute.', $id));
@@ -50,10 +50,14 @@ public function process(ContainerBuilder $container)
                 }
 
                 $providerDef = $container->getDefinition($id);
-                if (!$providerDef->getFactory()) {
+                if (!$providerDef->getFactory() && $providerDef->getClass()) {
                     // You are on your own if you use a factory to create a provider.
                     // It would fail in runtime if the factory does not return a proper provider.
-                    $this->assertClassImplementsPagerProviderInterface($id, $providerDef->getClass());
+                    $this->assertClassImplementsPagerProviderInterface($id, $container->getParameterBag()->resolveValue($providerDef->getClass()));
+                }
+
+                if (!$providerDef->isPublic()) {
+                    throw new \InvalidArgumentException(sprintf('Elastica persister "%s" must be a public service', $id));
                 }
 
                 $registeredProviders[$index][$type] = $id;

src/DependencyInjection/Compiler/RegisterPersistersPass.php

@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
         $registry = $container->getDefinition('fos_elastica.persister_registry');
 
         $registeredPersisters = [];
-        foreach ($container->findTaggedServiceIds('fos_elastica.persister') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('fos_elastica.persister', true) as $id => $attributes) {
             foreach ($attributes as $attribute) {
                 if (!isset($attribute['type'])) {
                     throw new \InvalidArgumentException(sprintf('Elastica persister "%s" must specify the "type" attribute.', $id));
@@ -50,10 +50,14 @@ public function process(ContainerBuilder $container)
                 }
 
                 $persisterDef = $container->getDefinition($id);
-                if (!$persisterDef->getFactory()) {
+                if (!$persisterDef->getFactory() && $persisterDef->getClass()) {
                     // You are on your own if you use a factory to create a persister.
                     // It would fail in runtime if the factory does not return a proper persister.
-                    $this->assertClassImplementsPersisterInterface($id, $persisterDef->getClass());
+                    $this->assertClassImplementsPersisterInterface($id, $container->getParameterBag()->resolveValue($persisterDef->getClass()));
+                }
+
+                if (!$persisterDef->isPublic()) {
+                    throw new \InvalidArgumentException(sprintf('Elastica persister "%s" must be a public service', $id));
                 }
 
                 $registeredPersisters[$index][$type] = $id;
@@ -82,4 +86,4 @@ private function assertClassImplementsPersisterInterface($persisterId, $persiste
             ));
         }
     }
-}
+}

src/FOSElasticaBundle.php

@@ -18,7 +18,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPagerProvidersPass;
 use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPersistersPass;
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class FOSElasticaBundle extends Bundle
@@ -32,8 +31,8 @@ public function build(ContainerBuilder $container)
 
         $container->addCompilerPass(new ConfigSourcePass());
         $container->addCompilerPass(new IndexPass());
-        $container->addCompilerPass(new RegisterPagerProvidersPass(), PassConfig::TYPE_BEFORE_REMOVING);
-        $container->addCompilerPass(new RegisterPersistersPass(), PassConfig::TYPE_BEFORE_REMOVING);
+        $container->addCompilerPass(new RegisterPagerProvidersPass());
+        $container->addCompilerPass(new RegisterPersistersPass());
         $container->addCompilerPass(new RegisterPagerPersistersPass());
         $container->addCompilerPass(new TransformerPass());
     }