Add test and use ternary operator

dunglas · dunglas · commit 48dd4f9ee2c0 · 2017-01-20T01:03:01.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -331,14 +331,9 @@ private function parseDefinition($id, $service, $file, array $defaults)
             }
         }
 
-        if (isset($service['tags'])) {
-            $tags = $service['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));
-            }
-        } else {
-            $tags = array();
+        $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'])) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services31_invalid_tags.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services31_invalid_tags.yml
@@ -0,0 +1,7 @@
+services:
+    _defaults:
+        tags: ['foo']
+
+    Foo\Bar:
+        tags: invalid
+        inherit_tags: true
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_configurator_short_syntax.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_configurator_short_syntax.yml
@@ -1,5 +1,4 @@
 services:
-
     foo_bar:
         class: FooBarClass
         configurator: foo_bar_configurator:configure
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -408,4 +408,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 services29_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');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -331,14 +331,9 @@ private function parseDefinition($id, $service, $file, array $defaults)`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`
`334`		`- if (isset($service['tags'])) {`
`335`		`- $tags = $service['tags'];`
`336`		`-`
`337`		`- if (!is_array($tags)) {`
`338`		`- throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));`
`339`		`- }`
`340`		`- } else {`
`341`		`- $tags = array();`
	`334`	`+ $tags = isset($service['tags']) ? $service['tags'] : array();`
	`335`	`+ if (!is_array($tags)) {`
	`336`	`+ throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));`
`342`	`337`	`}`
`343`	`338`
`344`	`339`	`if (!isset($defaults['tags'])) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`services:`
`2`		`-`
`3`	`2`	`foo_bar:`
`4`	`3`	`class: FooBarClass`
`5`	`4`	`configurator: foo_bar_configurator:configure`