feature #21313 [DI] Add Yaml syntax for short services definition (ogizanagi)

fabpot · fabpot · commit 4e665548c2c6 · 2017-01-23T13:43:33.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Add Yaml syntax for short services definition | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | todo In my experience, most (at least, a lot) of the service definitions in an end-application only require the class and constructor arguments. #21133 allows to get rid of the `class` attribute by using the service id. Which means only arguments remain for most use-cases. Hence, we could support this syntax: #### Before: ```yml services: App\Foo\Bar: arguments: ['@baz', 'foo', '%qux%'] ``` #### After: ```yml services: App\Foo\Bar: ['@baz', 'foo', '%qux%'] ``` It works especially well along with services `_defaults` introduced in #21071 : ```yml services: _defaults: public: false autowire: ['set*'] tags: ['serializer.normalizer'] App\Serializer\FooNormalizer: ['@baz', 'foo', '%qux%'] ``` Commits ------- 83b599c [DI] Add Yaml syntax for short services definition
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -245,6 +245,10 @@ private function parseDefinition($id, $service, $file, array $defaults)
             return;
         }
 
+        if (is_array($service) && array_values($service) === $service) {
+            $service = array('arguments' => $service);
+        }
+
         if (null === $service) {
             $service = array();
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services28.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services28.yml
@@ -39,3 +39,5 @@ services:
         alias: with_defaults
 
     with_defaults_aliased_short: '@with_defaults'
+
+    with_shortcut_args: [foo]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
@@ -39,3 +39,4 @@ services:
     new_factory1: { class: FooBarClass, factory: factory}
     new_factory2: { class: FooBarClass, factory: ['@baz', getClass]}
     new_factory3: { class: FooBarClass, factory: [BazClass, getInstance]}
+    with_shortcut_args: [foo, '@baz']
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -153,6 +153,7 @@ public function testLoadServices()
         $this->assertEquals('factory', $services['new_factory1']->getFactory(), '->load() parses the factory tag');
         $this->assertEquals(array(new Reference('baz'), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
         $this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
+        $this->assertEquals(array('foo', new Reference('baz')), $services['with_shortcut_args']->getArguments(), '->load() parses short service definition');
 
         $aliases = $container->getAliases();
         $this->assertTrue(isset($aliases['alias_for_foo']), '->load() parses aliases');
@@ -383,6 +384,10 @@ public function testDefaults()
         $this->assertArrayNotHasKey('public', $container->getDefinition('no_defaults_child')->getChanges());
         $this->assertArrayNotHasKey('autowire', $container->getDefinition('no_defaults_child')->getChanges());
 
+        $this->assertFalse($container->getDefinition('with_shortcut_args')->isPublic());
+        $this->assertSame(array('foo' => array(array())), $container->getDefinition('with_shortcut_args')->getTags());
+        $this->assertTrue($container->getDefinition('with_shortcut_args')->isAutowired());
+
         $container->compile();
 
         $this->assertTrue($container->getDefinition('with_null')->isPublic());

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,10 @@ private function parseDefinition($id, $service, $file, array $defaults)`
`245`	`245`	`return;`
`246`	`246`	`}`
`247`	`247`
	`248`	`+ if (is_array($service) && array_values($service) === $service) {`
	`249`	`+ $service = array('arguments' => $service);`
	`250`	`+ }`
	`251`	`+`
`248`	`252`	`if (null === $service) {`
`249`	`253`	`$service = array();`
`250`	`254`	`}`