Merge pull request #8 from yann-eugone/hotfix/compiler-pass-register

Fixed wrong usage of container while registering compiler passes

Author: Yann Eugoné

DependencyInjection/CompilerPass/ConventionedEnumCollectorCompilerPass.php

@@ -10,25 +10,24 @@
  */
 class ConventionedEnumCollectorCompilerPass implements CompilerPassInterface
 {
-    /**
-     * @var array
-     */
-    private $bundles;
-
-    /**
-     * @param array $bundles
-     */
-    public function __construct(array $bundles)
-    {
-        $this->bundles = $bundles;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
-        foreach ($this->bundles as $bundleClass) {
+        $bundles = $container->getParameter('enum.register_bundles');
+
+        if (!$bundles) {
+            return;
+        }
+
+        if (true === $bundles) {
+            $bundles = $container->getParameter('kernel.bundles');
+        } else {
+            $bundles = (array) $bundles;
+        }
+
+        foreach ($bundles as $bundleClass) {
             $declarativePass = new DeclarativeEnumCollectorCompilerPass($bundleClass);
             $declarativePass->process($container);
         }

EnumBundle.php

@@ -18,15 +18,10 @@ class EnumBundle extends Bundle
      */
     public function build(ContainerBuilder $container)
     {
-        if ($bundles = $container->getParameter('enum.register_bundles')) {
-            if (true === $bundles) {
-                $bundles = $container->getParameter('kernel.bundles');
-            } else {
-                $bundles = (array) $bundles;
-            }
-            $container->addCompilerPass(new ConventionedEnumCollectorCompilerPass($bundles));
-        }
-        $container->addCompilerPass(new TaggedEnumCollectorCompilerPass);
+        $container
+            ->addCompilerPass(new ConventionedEnumCollectorCompilerPass())
+            ->addCompilerPass(new TaggedEnumCollectorCompilerPass)
+        ;
     }
 
     /**

Tests/DependencyInjection/CompilerPass/ConventionedEnumCollectorCompilerPassTest.php

@@ -28,6 +28,10 @@ public function testCollectThroughBundles($bundle, $prefix)
 
         $namespace = (new \ReflectionClass($bundle))->getNamespaceName();
 
+        $container->getParameter('enum.register_bundles')
+              ->shouldBeCalled()
+              ->willReturn([$bundle]);
+
         $container
             ->setDefinition(
                 $prefix.'.enum.dummy',
@@ -66,7 +70,7 @@ public function testCollectThroughBundles($bundle, $prefix)
             )
             ->shouldBeCalled();
 
-        $compiler = new ConventionedEnumCollectorCompilerPass([$bundle]);
+        $compiler = new ConventionedEnumCollectorCompilerPass();
         $compiler->process($container->reveal());
     }