minor #21348 [DependencyInjection] Yaml: check if $tags is an array before using it (dunglas)

This PR was squashed before being merged into the 3.3-dev branch (closes #21348).

Discussion
----------

[DependencyInjection] Yaml: check if $tags is an array before using it

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

1c9b5c9 [DependencyInjection] Yaml: check if  is an array before using it

Author: nicolas-grekas

Loader/YamlFileLoader.php

@@ -352,6 +352,9 @@ private function parseDefinition($id, $service, $file, array $defaults)
         }
 
         $tags = isset($service['tags']) ? $service['tags'] : array();
+        if (!is_array($tags)) {
+            throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+        }
 
         if (!isset($defaults['tags'])) {
             // no-op
@@ -363,34 +366,28 @@ private function parseDefinition($id, $service, $file, array $defaults)
             $tags = array_merge($tags, $defaults['tags']);
         }
 
-        if (null !== $tags) {
-            if (!is_array($tags)) {
-                throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+        foreach ($tags as $tag) {
+            if (!is_array($tag)) {
+                $tag = array('name' => $tag);
             }
 
-            foreach ($tags as $tag) {
-                if (!is_array($tag)) {
-                    $tag = array('name' => $tag);
-                }
-
-                if (!isset($tag['name'])) {
-                    throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
-                }
-                $name = $tag['name'];
-                unset($tag['name']);
+            if (!isset($tag['name'])) {
+                throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
+            }
+            $name = $tag['name'];
+            unset($tag['name']);
 
-                if (!is_string($name) || '' === $name) {
-                    throw new InvalidArgumentException(sprintf('The tag name for service "%s" in %s must be a non-empty string.', $id, $file));
-                }
+            if (!is_string($name) || '' === $name) {
+                throw new InvalidArgumentException(sprintf('The tag name for service "%s" in %s must be a non-empty string.', $id, $file));
+            }
 
-                foreach ($tag as $attribute => $value) {
-                    if (!is_scalar($value) && null !== $value) {
-                        throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s. Check your YAML syntax.', $id, $name, $attribute, $file));
-                    }
+            foreach ($tag as $attribute => $value) {
+                if (!is_scalar($value) && null !== $value) {
+                    throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s. Check your YAML syntax.', $id, $name, $attribute, $file));
                 }
-
-                $definition->addTag($name, $tag);
             }
+
+            $definition->addTag($name, $tag);
         }
 
         if (isset($service['decorates'])) {

Tests/Fixtures/yaml/services31_invalid_tags.yml

@@ -0,0 +1,7 @@
+services:
+    _defaults:
+        tags: ['foo']
+
+    Foo\Bar:
+        tags: invalid
+        inherit_tags: true

Tests/Fixtures/yaml/services_configurator_short_syntax.yml

@@ -1,5 +1,4 @@
 services:
-
     foo_bar:
         class: FooBarClass
         configurator: foo_bar_configurator:configure

Tests/Loader/YamlFileLoaderTest.php

@@ -414,4 +414,14 @@ public function testDecoratedServicesWithWrongSyntaxThrowsException()
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('bad_decorates.yml');
     }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Parameter "tags" must be an array for service "Foo\Bar" in services31_invalid_tags.yml. Check your YAML syntax.
+     */
+    public function testInvalidTagsWithDefaults()
+    {
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services31_invalid_tags.yml');
+    }
 }