Added Yaml syntax shortcut for name-only tags

symfony · Nov 27, 2016 · 7fa8c8a · 7fa8c8a
1 parent ea7e245
commit 7fa8c8a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -267,7 +267,7 @@ private function parseDefinition($id, $service, $file)
 
             foreach ($service['tags'] as $tag) {
                 if (!is_array($tag)) {
-                    throw new InvalidArgumentException(sprintf('A "tags" entry must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+                    $tag = array('name' => $tag);
                 }
 
                 if (!isset($tag['name'])) {

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/badtag4.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/badtag4.yml
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/tag_name_only.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/tag_name_only.yml
@@ -0,0 +1,5 @@
+services:
+    foo_service:
+        class: FooClass
+        tags:
+          - foo
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -223,16 +223,6 @@ public function testNonArrayTagsThrowsException()
         }
     }
 
-    /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
-     * @expectedExceptionMessage A "tags" entry must be an array for service
-     */
-    public function testNonArrayTagThrowsException()
-    {
-        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
-        $loader->load('badtag4.yml');
-    }
-
     public function testTagWithoutNameThrowsException()
     {
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
@@ -245,6 +235,15 @@ public function testTagWithoutNameThrowsException()
         }
     }
 
+    public function testNameOnlyTagsAreAllowedAsString()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('tag_name_only.yml');
+
+        $this->assertCount(1, $container->getDefinition('foo_service')->getTag('foo'));
+    }
+
     public function testTagWithAttributeArrayThrowsException()
     {
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));