symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php‎
Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php‎
Lines changed: 28 additions & 4 deletions b/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php‎
Lines changed: 28 additions & 4 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php‎
Lines changed: 17 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php‎
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php‎
Lines changed: 21 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php‎
Lines changed: 21 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php‎
Lines changed: 68 additions & 8 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php‎
Lines changed: 68 additions & 8 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php‎
Lines changed: 68 additions & 8 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php‎
Lines changed: 68 additions & 8 deletions
@@ -955,6 +955,18 @@ public function createService(Definition $definition, $id, $tryProxy = true)
             }
 
             $service = call_user_func_array(array($factory, $definition->getFactoryMethod()), $arguments);
+        } elseif (null !== $definition->getFactory()) {
+            $factory = $definition->getFactory();
+
+            if (is_string($factory)) {
+                $callable = $definition->getFactory();
+            } elseif (is_array($factory)) {
+                $callable = array($this->resolveServices($factory[0]), $factory[1]);
+            } else {
+                throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
+            }
+
+            $service = call_user_func_array($callable, $arguments);
         } else {
             $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
 
 
@@ -730,13 +730,13 @@ private function addNewInstance($id, Definition $definition, $return, $instantia
                 $class = $this->dumpValue($callable[0]);
                 // If the class is a string we can optimize call_user_func away
                 if (strpos($class, "'") === 0) {
-                    return sprintf("        $return{$instantiation}\%s::%s(%s);\n", substr($class, 1, -1), $callable[1], $arguments ? implode(', ', $arguments) : '');
+                    return sprintf("        $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '');
                 }
 
-                return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s'), %s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
+                return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
             }
 
-            return sprintf("        $return{$instantiation}%s(%s);\n", $callable, $arguments ? implode(', ', $arguments) : '');
+            return sprintf("        $return{$instantiation}\\%s(%s);\n", $callable, $arguments ? implode(', ', $arguments) : '');
         } elseif (null !== $definition->getFactoryMethod()) {
             if (null !== $definition->getFactoryClass()) {
                 $class = $this->dumpValue($definition->getFactoryClass());
@@ -1212,7 +1212,7 @@ private function hasReference($id, array $arguments, $deep = false, array $visit
     /**
      * Dumps values.
      *
-     * @param array   $value
+     * @param mixed   $value
      * @param bool    $interpolate
      *
      * @return string
@@ -1249,6 +1249,30 @@ private function dumpValue($value, $interpolate = true)
                 throw new RuntimeException('Cannot dump definitions which have a variable class name.');
             }
 
+            if (null !== $value->getFactory()) {
+                $factory = $value->getFactory();
+
+                if (is_string($factory)) {
+                    return sprintf('\\%s(%s)', $factory, implode(', ', $arguments));
+                }
+
+                if (is_array($factory)) {
+                    if (is_string($factory[0])) {
+                        return sprintf('\\%s::%s(%s)', $factory[0], $factory[1], implode(', ', $arguments));
+                    }
+
+                    if ($factory[0] instanceof Definition) {
+                        return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
+                    }
+
+                    if ($factory[0] instanceof Reference) {
+                        return sprintf('%s->%s(%s)', $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));
+                    }
+                }
+
+                throw new RuntimeException('Cannot dump definition because of invalid factory');
+            }
+
             if (null !== $value->getFactoryMethod()) {
                 if (null !== $value->getFactoryClass()) {
                     return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($value->getFactoryClass()), $value->getFactoryMethod(), count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
 
@@ -341,6 +341,23 @@ public function testCreateServiceFactoryService()
         $this->assertInstanceOf('BazClass', $builder->get('baz_service'));
     }
 
+    /**
+     * @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
+     */
+    public function testCreateServiceFactory()
+    {
+        $builder = new ContainerBuilder();
+        $builder->register('foo', 'Bar\FooClass')->setFactory('Bar\FooClass::getInstance');
+        $builder->register('qux', 'Bar\FooClass')->setFactory(array('Bar\FooClass', 'getInstance'));
+        $builder->register('bar', 'Bar\FooClass')->setFactory(array(new Definition('Bar\FooClass'), 'getInstance'));
+        $builder->register('baz', 'Bar\FooClass')->setFactory(array(new Reference('bar'), 'getInstance'));
+
+        $this->assertTrue($builder->get('foo')->called, '->createService() calls the factory method to create the service instance');
+        $this->assertTrue($builder->get('qux')->called, '->createService() calls the factory method to create the service instance');
+        $this->assertTrue($builder->get('bar')->called, '->createService() uses anonymous service as factory');
+        $this->assertTrue($builder->get('baz')->called, '->createService() uses another service as factory');
+    }
+
     /**
      * @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
      */
 
@@ -101,12 +101,14 @@ public function testAddService()
         // without compilation
         $container = include self::$fixturesPath.'/containers/container9.php';
         $dumper = new PhpDumper($container);
+
         $this->assertEquals(str_replace('%path%', str_replace('\\','\\\\',self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9.php')), $dumper->dump(), '->dump() dumps services');
 
         // with compilation
         $container = include self::$fixturesPath.'/containers/container9.php';
         $container->compile();
         $dumper = new PhpDumper($container);
+
         $this->assertEquals(str_replace('%path%', str_replace('\\','\\\\',self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9_compiled.php')), $dumper->dump(), '->dump() dumps services');
 
         $dumper = new PhpDumper($container = new ContainerBuilder());
 
@@ -4,6 +4,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -110,9 +111,28 @@
     ->setPublic(false)
 ;
 $container
-    ->register('new_factory_service', 'FooBarBaz')
+    ->register('service_from_referenced_factory', 'FooBarBaz')
     ->setProperty('foo', 'bar')
     ->setFactory(array(new Reference('new_factory'), 'getInstance'))
 ;
+$container
+    ->register('service_from_anonymous_factory', 'Bar\FooClass')
+    ->setFactory(array(new Definition('Bar\FooClass'), 'getInstance'))
+;
+
+$container
+    ->register('service_from_static_method1', 'Bar\FooClass')
+    ->setFactory('Bar\FooClass::getInstance')
+;
+$container
+    ->register('service_from_static_method2', 'Bar\FooClass')
+    ->setFactory(array('Bar\FooClass', 'getInstance'))
+;
+$anonymousServiceWithFactory = new Definition('Bar\FooClass');
+$anonymousServiceWithFactory->setFactory('Bar\FooClass::getInstance');
+$container
+    ->register('service_with_method_call_and_factory', 'Bar\FooClass')
+    ->addMethodCall('setBar', array($anonymousServiceWithFactory))
+;
 
 return $container;
@@ -45,8 +45,12 @@ public function __construct()
             'inlined' => 'getInlinedService',
             'method_call1' => 'getMethodCall1Service',
             'new_factory' => 'getNewFactoryService',
-            'new_factory_service' => 'getNewFactoryServiceService',
             'request' => 'getRequestService',
+            'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
+            'service_from_referenced_factory' => 'getServiceFromReferencedFactoryService',
+            'service_from_static_method1' => 'getServiceFromStaticMethod1Service',
+            'service_from_static_method2' => 'getServiceFromStaticMethod2Service',
+            'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
@@ -274,33 +278,89 @@ protected function getMethodCall1Service()
     }
 
     /**
-     * Gets the 'new_factory_service' service.
+     * Gets the 'request' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @throws RuntimeException always since this service is expected to be injected dynamically
+     */
+    protected function getRequestService()
+    {
+        throw new RuntimeException('You have requested a synthetic service ("request"). The DIC does not know how to construct this service.');
+    }
+
+    /**
+     * Gets the 'service_from_anonymous_factory' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar\FooClass A Bar\FooClass instance.
+     */
+    protected function getServiceFromAnonymousFactoryService()
+    {
+        return $this->services['service_from_anonymous_factory'] = call_user_func(array(new \Bar\FooClass(), 'getInstance'));
+    }
+
+    /**
+     * Gets the 'service_from_referenced_factory' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
      * @return \FooBarBaz A FooBarBaz instance.
      */
-    protected function getNewFactoryServiceService()
+    protected function getServiceFromReferencedFactoryService()
     {
-        $this->services['new_factory_service'] = $instance = $this->get('new_factory')->getInstance();
+        $this->services['service_from_referenced_factory'] = $instance = $this->get('new_factory')->getInstance();
 
         $instance->foo = 'bar';
 
         return $instance;
     }
 
     /**
-     * Gets the 'request' service.
+     * Gets the 'service_from_static_method1' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @throws RuntimeException always since this service is expected to be injected dynamically
+     * @return \Bar\FooClass A Bar\FooClass instance.
      */
-    protected function getRequestService()
+    protected function getServiceFromStaticMethod1Service()
     {
-        throw new RuntimeException('You have requested a synthetic service ("request"). The DIC does not know how to construct this service.');
+        return $this->services['service_from_static_method1'] = \Bar\FooClass::getInstance();
+    }
+
+    /**
+     * Gets the 'service_from_static_method2' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar\FooClass A Bar\FooClass instance.
+     */
+    protected function getServiceFromStaticMethod2Service()
+    {
+        return $this->services['service_from_static_method2'] = \Bar\FooClass::getInstance();
+    }
+
+    /**
+     * Gets the 'service_with_method_call_and_factory' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar\FooClass A Bar\FooClass instance.
+     */
+    protected function getServiceWithMethodCallAndFactoryService()
+    {
+        $this->services['service_with_method_call_and_factory'] = $instance = new \Bar\FooClass();
+
+        $instance->setBar(\Bar\FooClass::getInstance());
+
+        return $instance;
     }
 
     /**
 
@@ -48,8 +48,12 @@ public function __construct()
             'foo_bar' => 'getFooBarService',
             'foo_with_inline' => 'getFooWithInlineService',
             'method_call1' => 'getMethodCall1Service',
-            'new_factory_service' => 'getNewFactoryServiceService',
             'request' => 'getRequestService',
+            'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
+            'service_from_referenced_factory' => 'getServiceFromReferencedFactoryService',
+            'service_from_static_method1' => 'getServiceFromStaticMethod1Service',
+            'service_from_static_method2' => 'getServiceFromStaticMethod2Service',
+            'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
@@ -273,36 +277,92 @@ protected function getMethodCall1Service()
     }
 
     /**
-     * Gets the 'new_factory_service' service.
+     * Gets the 'request' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @throws RuntimeException always since this service is expected to be injected dynamically
+     */
+    protected function getRequestService()
+    {
+        throw new RuntimeException('You have requested a synthetic service ("request"). The DIC does not know how to construct this service.');
+    }
+
+    /**
+     * Gets the 'service_from_anonymous_factory' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar\FooClass A Bar\FooClass instance.
+     */
+    protected function getServiceFromAnonymousFactoryService()
+    {
+        return $this->services['service_from_anonymous_factory'] = call_user_func(array(new \Bar\FooClass(), 'getInstance'));
+    }
+
+    /**
+     * Gets the 'service_from_referenced_factory' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
      * @return \FooBarBaz A FooBarBaz instance.
      */
-    protected function getNewFactoryServiceService()
+    protected function getServiceFromReferencedFactoryService()
     {
         $a = new \FactoryClass();
         $a->foo = 'bar';
 
-        $this->services['new_factory_service'] = $instance = $a->getInstance();
+        $this->services['service_from_referenced_factory'] = $instance = $a->getInstance();
 
         $instance->foo = 'bar';
 
         return $instance;
     }
 
     /**
-     * Gets the 'request' service.
+     * Gets the 'service_from_static_method1' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @throws RuntimeException always since this service is expected to be injected dynamically
+     * @return \Bar\FooClass A Bar\FooClass instance.
      */
-    protected function getRequestService()
+    protected function getServiceFromStaticMethod1Service()
     {
-        throw new RuntimeException('You have requested a synthetic service ("request"). The DIC does not know how to construct this service.');
+        return $this->services['service_from_static_method1'] = \Bar\FooClass::getInstance();
+    }
+
+    /**
+     * Gets the 'service_from_static_method2' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar\FooClass A Bar\FooClass instance.
+     */
+    protected function getServiceFromStaticMethod2Service()
+    {
+        return $this->services['service_from_static_method2'] = \Bar\FooClass::getInstance();
+    }
+
+    /**
+     * Gets the 'service_with_method_call_and_factory' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Bar\FooClass A Bar\FooClass instance.
+     */
+    protected function getServiceWithMethodCallAndFactoryService()
+    {
+        $this->services['service_with_method_call_and_factory'] = $instance = new \Bar\FooClass();
+
+        $instance->setBar(\Bar\FooClass::getInstance());
+
+        return $instance;
     }
 
     /**