[DependencyInjection] Fix FactoryReturnTypePass position in PassConfig

hason · hason · commit 1550649257b0 · 2016-10-21T12:49:22.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -44,10 +44,10 @@ public function __construct()
             new ResolveDefinitionTemplatesPass(),
             new DecoratorServicePass(),
             new ResolveParameterPlaceHoldersPass(),
+            new FactoryReturnTypePass(),
             new CheckDefinitionValidityPass(),
             new ResolveReferencesToAliasesPass(),
             new ResolveInvalidReferencesPass(),
-            new FactoryReturnTypePass(),
             new AutowirePass(),
             new AnalyzeServiceReferencesPass(true),
             new CheckCircularReferencesPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/FactoryReturnTypePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/FactoryReturnTypePassTest.php
@@ -30,8 +30,10 @@ public function testProcess()
         $factory = $container->register('factory');
         $factory->setFactory(array(FactoryDummy::class, 'createFactory'));
 
+        $container->setAlias('alias_factory', 'factory');
+
         $foo = $container->register('foo');
-        $foo->setFactory(array(new Reference('factory'), 'create'));
+        $foo->setFactory(array(new Reference('alias_factory'), 'create'));
 
         $bar = $container->register('bar', __CLASS__);
         $bar->setFactory(array(new Reference('factory'), 'create'));
@@ -100,4 +102,22 @@ public function testCircularReference()
         $this->assertNull($factory->getClass());
         $this->assertNull($factory2->getClass());
     }
+
+    public function testCompile()
+    {
+        $container = new ContainerBuilder();
+
+        $factory = $container->register('factory');
+        $factory->setFactory(array(FactoryDummy::class, 'createFactory'));
+
+        try {
+            $container->compile();
+        } catch (\RuntimeException $e) {
+            if (method_exists(\ReflectionMethod::class, 'getReturnType')) {
+                $this->fail('The FactoryReturnTypePass should set the class to service "factory".');
+            } else {
+                $this->assertEquals('Please add the class to service "factory" even if it is constructed by a factory since we might need to add method calls based on compile-time checks.', $e->getMessage());
+            }
+        }
+    }
 }
