Fix support for decorating persister services

Waiting until the before_removing step to check for persisters breaks support
for service decoration, as it has already been resolved at this point (and so
the original id won't be used anymore to reference the service).
The first benefit was that the class was already resolved in case a parameter
was used, but this is solved in a better way by resolving the value.
The second benefit was that the class was already resolved when using
definition inheritance. The interface validation is now skipped in such case
(which should not fail anyway, as the parent service will likely be our own
one in such case, which has a valid class).

Author: stof

src/DependencyInjection/Compiler/RegisterPagerPersistersPass.php

@@ -47,10 +47,10 @@ 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()));
                 }
 
                 $nameToServiceIdMap[$persisterName] = $id;
@@ -79,4 +79,4 @@ private function assertClassImplementsPagerPersisterInterface($persisterId, $per
             ));
         }
     }
-}
+}

src/DependencyInjection/Compiler/RegisterPagerProvidersPass.php

@@ -50,10 +50,10 @@ 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()));
                 }
 
                 $registeredProviders[$index][$type] = $id;

src/DependencyInjection/Compiler/RegisterPersistersPass.php

@@ -50,10 +50,10 @@ 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()));
                 }
 
                 $registeredPersisters[$index][$type] = $id;
@@ -82,4 +82,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());
     }