Allow null values as tag attributes

lsmith77 · fabpot · commit 639b0fa967e6 · 2013-09-16T10:01:04.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -79,7 +79,7 @@ public function process(ContainerBuilder $container)
             foreach ($definition->getTags() as $name => $tags) {
                 foreach ($tags as $attributes) {
                     foreach ($attributes as $attribute => $value) {
-                        if (!is_scalar($value)) {
+                        if (!is_scalar($value) && null !== $value) {
                             throw new RuntimeException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $id, $name, $attribute));
                         }
                     }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -224,7 +224,7 @@ private function parseDefinition($id, $service, $file)
                 unset($tag['name']);
 
                 foreach ($tag as $attribute => $value) {
-                    if (!is_scalar($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.', $id, $name, $attribute, $file));
                     }
                 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -61,6 +61,17 @@ public function testProcess()
         $this->process($container);
     }
 
+    public function testValidTags()
+    {
+        $container = new ContainerBuilder();
+        $container->register('a', 'class')->addTag('foo', array('bar' => 'baz'));
+        $container->register('b', 'class')->addTag('foo', array('bar' => null));
+        $container->register('c', 'class')->addTag('foo', array('bar' => 1));
+        $container->register('d', 'class')->addTag('foo', array('bar' => 1.1));
+
+        $this->process($container);
+    }
+
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
      */

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function process(ContainerBuilder $container)`
`79`	`79`	`foreach ($definition->getTags() as $name => $tags) {`
`80`	`80`	`foreach ($tags as $attributes) {`
`81`	`81`	`foreach ($attributes as $attribute => $value) {`
`82`		`- if (!is_scalar($value)) {`
	`82`	`+ if (!is_scalar($value) && null !== $value) {`
`83`	`83`	`throw new RuntimeException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $id, $name, $attribute));`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ private function parseDefinition($id, $service, $file)`
`224`	`224`	`unset($tag['name']);`
`225`	`225`
`226`	`226`	`foreach ($tag as $attribute => $value) {`
`227`		`- if (!is_scalar($value)) {`
	`227`	`+ if (!is_scalar($value) && null !== $value) {`
`228`	`228`	`throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s.', $id, $name, $attribute, $file));`
`229`	`229`	`}`
`230`	`230`	`}`