Fix implementation of allowEmptyItems

Author: wouterj

QuietFactory.php

@@ -2,9 +2,7 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle;
 
-use Knp\Menu\Factory\ExtensionInterface;
 use Knp\Menu\FactoryInterface;
-use Knp\Menu\ItemInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
@@ -27,8 +25,9 @@ class QuietFactory implements FactoryInterface
     private $logger;
 
     /**
-     * Whether to return null or a MenuItem without any URL if no URL can be
-     * found for a MenuNode.
+     * Whether to return null (if value is false) or a MenuItem
+     * without any URL (if value is true) if no URL can be found
+     * for a MenuNode.
      *
      * @var bool
      */
@@ -54,6 +53,12 @@ public function createItem($name, array $options = array())
             if (!$this->allowEmptyItems) {
                 return null;
             }
+
+            // remove route and content options
+            unset($options['route']);
+            unset($options['content']);
+
+            return $this->innerFactory->createItem($name, $options);
         }
     }
 }

Tests/Unit/QuietFactoryTest.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Unit;
+
+use Symfony\Cmf\Bundle\MenuBundle\QuietFactory;
+
+class QuietFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    private $innerFactory;
+    private $logger;
+
+    protected function setUp()
+    {
+        $this->innerFactory = $this->prophesize('Knp\Menu\FactoryInterface');
+        $this->logger = $this->prophesize('Psr\Log\LoggerInterface');
+    }
+
+    public function provideItemsWithNotExistingLinks()
+    {
+        return array(
+            array(array('route' => 'not_existent')),
+            array(array('content' => 'not_existent')),
+            array(array('linkType' => 'route', 'route' => 'not_existent')),
+        );
+    }
+
+    /** @dataProvider provideItemsWithNotExistingLinks */
+    public function testAllowEmptyItemsReturnsItemWithoutURL(array $options)
+    {
+        $this->innerFactory->createItem('Home', $options)
+            ->willThrow('Symfony\Component\Routing\Exception\RouteNotFoundException');
+
+        $homeMenuItem = new \stdClass();
+        $this->innerFactory->createItem('Home', array())->willReturn($homeMenuItem);
+
+        $factory = new QuietFactory($this->innerFactory->reveal(), $this->logger->reveal(), true);
+
+        $this->assertEquals($homeMenuItem, $factory->createItem('Home', $options));
+    }
+
+    public function testDisallowEmptyItemsReturnsNull()
+    {
+        $this->innerFactory->createItem('Home', array('route' => 'not_existent'))
+            ->willThrow('Symfony\Component\Routing\Exception\RouteNotFoundException');
+
+        $factory = new QuietFactory($this->innerFactory->reveal(), $this->logger->reveal(), false);
+
+        $this->assertEquals(null, $factory->createItem('Home', array('route' => 'not_existent')));
+    }
+}