symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/badtag4.yml
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/badtag4.yml
-6Lines changed: 0 additions & 6 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/badtag4.yml
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/badtag4.yml
-6Lines changed: 0 additions & 6 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/tag_name_only.yml
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/tag_name_only.yml
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+9-10Lines changed: 9 additions & 10 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+9-10Lines changed: 9 additions & 10 deletions
@@ -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'])) {
 
@@ -0,0 +1,5 @@
+services:
+    foo_service:
+        class: FooClass
+        tags:
+          - foo
@@ -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'));
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ private function parseDefinition($id, $service, $file)`
`267`	`267`
`268`	`268`	`foreach ($service['tags'] as $tag) {`
`269`	`269`	`if (!is_array($tag)) {`
`270`		`- throw new InvalidArgumentException(sprintf('A "tags" entry must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));`
	`270`	`+ $tag = array('name' => $tag);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`if (!isset($tag['name'])) {`
Original file line number	Diff line number	Diff line change
`@@ -223,16 +223,6 @@ public function testNonArrayTagsThrowsException()`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`226`		`- /**`
`227`		`- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException`
`228`		`- * @expectedExceptionMessage A "tags" entry must be an array for service`
`229`		`- */`
`230`		`- public function testNonArrayTagThrowsException()`
`231`		`- {`
`232`		`- $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));`
`233`		`- $loader->load('badtag4.yml');`
`234`		`- }`
`235`		`-`
`236`	`226`	`public function testTagWithoutNameThrowsException()`
`237`	`227`	`{`
`238`	`228`	`$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));`
`@@ -245,6 +235,15 @@ public function testTagWithoutNameThrowsException()`
`245`	`235`	`}`
`246`	`236`	`}`
`247`	`237`
	`238`	`+ public function testNameOnlyTagsAreAllowedAsString()`
	`239`	`+ {`
	`240`	`+ $container = new ContainerBuilder();`
	`241`	`+ $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));`
	`242`	`+ $loader->load('tag_name_only.yml');`
	`243`	`+`
	`244`	`+ $this->assertCount(1, $container->getDefinition('foo_service')->getTag('foo'));`
	`245`	`+ }`
	`246`	`+`
`248`	`247`	`public function testTagWithAttributeArrayThrowsException()`
`249`	`248`	`{`
`250`	`249`	`$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));`