merged branch palex-fpt/I-7542 (PR symfony#7595)

fabpot · fabpot · commit c9c687ea41e1 · 2013-04-09T16:14:25.000+02:00
This PR was merged into the master branch. Discussion ---------- YamlDumper should dump Definition::$factoryClass setting It should fix symfony#7542 Commits ------- 77f00d2 YamlDumper should dump Definition::getFactoryClass() setting
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -102,6 +102,10 @@ private function addService($id, $definition)
             $code .= sprintf("        synchronized: true\n");
         }
 
+        if ($definition->getFactoryClass()) {
+            $code .= sprintf("        factory_class: %s\n", $definition->getFactoryClass());
+        }
+
         if ($definition->getFactoryMethod()) {
             $code .= sprintf("        factory_method: %s\n", $definition->getFactoryMethod());
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -9,6 +9,7 @@ services:
         tags:
             - { name: foo, foo: foo }
             - { name: foo, bar: bar }
+        factory_class: FooClass
         factory_method: getInstance
         arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', foobar: '%foo%' }, true, '@service_container']
         properties: { foo: bar, moo: '@foo.baz' }
@@ -23,6 +24,7 @@ services:
         configurator: ['@foo.baz', configure]
     foo.baz:
         class: %baz_class%
+        factory_class: %baz_class%
         factory_method: getInstance
         configurator: ['%baz_class%', configureStatic1]
     foo_bar:

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,10 @@ private function addService($id, $definition)`
`102`	`102`	`$code .= sprintf(" synchronized: true\n");`
`103`	`103`	`}`
`104`	`104`
	`105`	`+ if ($definition->getFactoryClass()) {`
	`106`	`+ $code .= sprintf(" factory_class: %s\n", $definition->getFactoryClass());`
	`107`	`+ }`
	`108`	`+`
`105`	`109`	`if ($definition->getFactoryMethod()) {`
`106`	`110`	`$code .= sprintf(" factory_method: %s\n", $definition->getFactoryMethod());`
`107`	`111`	`}`