do not stumble upon empty tags

xabbuh · xabbuh · commit da0cc7369fc7 · 2015-12-09T23:37:54.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 
 class UnusedTagsPassTest extends \PHPUnit_Framework_TestCase
 {
@@ -49,4 +51,15 @@ public function testProcess()
 
         $pass->process($container);
     }
+
+    public function testEmptyTagNameIsIgnored()
+    {
+        $pass = new UnusedTagsPass();
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('foo');
+        $definition->addTag('', array('bar' => 'baz'));
+
+        $pass->process($container);
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1040,7 +1040,7 @@ public function findTags()
      */
     public function findUnusedTags()
     {
-        return array_values(array_diff($this->findTags(), $this->usedTags));
+        return array_filter(array_values(array_diff($this->findTags(), $this->usedTags)));
     }
 
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)

Original file line number	Diff line number	Diff line change
`@@ -1040,7 +1040,7 @@ public function findTags()`
`1040`	`1040`	`*/`
`1041`	`1041`	`public function findUnusedTags()`
`1042`	`1042`	`{`
`1043`		`- return array_values(array_diff($this->findTags(), $this->usedTags));`
	`1043`	`+ return array_filter(array_values(array_diff($this->findTags(), $this->usedTags)));`
`1044`	`1044`	`}`
`1045`	`1045`
`1046`	`1046`	`public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)`