Updated the bundle to support the new matcher

Author: stof

DependencyInjection/Compiler/AddVotersPass.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Knp\Bundle\MenuBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * This compiler pass registers the renderers in the RendererProvider.
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class AddVotersPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('knp_menu.matcher')) {
+            return;
+        }
+        $definition = $container->getDefinition('knp_menu.matcher');
+
+        foreach ($container->findTaggedServiceIds('knp_menu.voter') as $id => $tags) {
+            $definition->addMethodCall('addVoter', array(new Reference($id)));
+        }
+    }
+}

KnpMenuBundle.php

@@ -8,6 +8,7 @@
 use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddProvidersPass;
 use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddRenderersPass;
 use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddTemplatePathPass;
+use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddVotersPass;
 
 class KnpMenuBundle extends Bundle
 {
@@ -19,5 +20,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new AddProvidersPass());
         $container->addCompilerPass(new AddRenderersPass());
         $container->addCompilerPass(new AddTemplatePathPass());
+        $container->addCompilerPass(new AddVotersPass());
     }
 }

Resources/config/menu.xml

@@ -7,6 +7,7 @@
     <parameters>
         <parameter key="knp_menu.factory.class">Knp\Menu\Silex\RouterAwareFactory</parameter>
         <parameter key="knp_menu.helper.class">Knp\Menu\Twig\Helper</parameter>
+        <parameter key="knp_menu.matcher.class">Knp\Menu\Matcher\Matcher</parameter>
         <parameter key="knp_menu.menu_provider.chain.class">Knp\Menu\Provider\ChainProvider</parameter>
         <parameter key="knp_menu.menu_provider.container_aware.class">Knp\Bundle\MenuBundle\Provider\ContainerAwareProvider</parameter>
         <parameter key="knp_menu.menu_provider.builder_alias.class">Knp\Bundle\MenuBundle\Provider\BuilderAliasProvider</parameter>
@@ -25,6 +26,8 @@
             <argument type="service" id="knp_menu.menu_provider" />
         </service>
 
+        <service id="knp_menu.matcher" class="%knp_menu.matcher.class%" />
+
         <service id="knp_menu.menu_provider.chain" class="%knp_menu.menu_provider.chain.class%" public="false">
             <argument type="collection" />
         </service>
@@ -48,6 +51,7 @@
 
         <service id="knp_menu.renderer.list" class="%knp_menu.renderer.list.class%">
             <tag name="knp_menu.renderer" alias="list" />
+            <argument type="service" id="knp_menu.matcher" />
             <argument>%knp_menu.renderer.list.options%</argument>
             <argument>%kernel.charset%</argument>
         </service>

Resources/config/twig.xml

@@ -19,6 +19,7 @@
             <tag name="knp_menu.renderer" alias="twig" />
             <argument type="service" id="twig" />
             <argument>%knp_menu.renderer.twig.template%</argument>
+            <argument type="service" id="knp_menu.matcher" />
             <argument>%knp_menu.renderer.twig.options%</argument>
         </service>
     </services>

Resources/doc/menu_service.md

@@ -38,7 +38,6 @@ class MenuBuilder
     public function createMainMenu(Request $request)
     {
         $menu = $this->factory->createItem('root');
-        $menu->setCurrentUri($request->getRequestUri());
 
         $menu->addChild('Home', array('route' => 'homepage'));
         // ... add more children
@@ -95,7 +94,6 @@ class MenuBuilder
     public function createSidebarMenu(Request $request)
     {
         $menu = $this->factory->createItem('sidebar');
-        $menu->setCurrentUri($request->getRequestUri());
 
         $menu->addChild('Home', array('route' => 'homepage'));
         // ... add more children

Tests/DependencyInjection/Compiler/AddVotersPassTest.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Knp\Bundle\MenuBundle\Tests\DependencyInjection\Compiler;
+
+use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddVotersPass;
+use Symfony\Component\DependencyInjection\Reference;
+
+class AddVotersPassTest extends \PHPUnit_Framework_TestCase
+{
+    public function testProcessWithoutProviderDefinition()
+    {
+        $menuPass = new AddVotersPass();
+
+        $this->assertNull($menuPass->process($this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder')));
+    }
+
+    public function testProcessWithAlias()
+    {
+        $definitionMock = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $definitionMock->expects($this->once())
+            ->method('addMethodCall')
+            ->with($this->equalTo('addVoter'), $this->equalTo(array(new Reference('id'))));
+
+        $containerBuilderMock = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $containerBuilderMock->expects($this->once())
+            ->method('hasDefinition')
+            ->will($this->returnValue(true));
+        $containerBuilderMock->expects($this->once())
+            ->method('findTaggedServiceIds')
+            ->with($this->equalTo('knp_menu.voter'))
+            ->will($this->returnValue(array('id' => array('tag1' => array()))));
+        $containerBuilderMock->expects($this->once())
+            ->method('getDefinition')
+            ->with($this->equalTo('knp_menu.matcher'))
+            ->will($this->returnValue($definitionMock));
+
+        $menuPass = new AddVotersPass();
+        $menuPass->process($containerBuilderMock);
+    }
+}

composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require":      {
-        "knplabs/knp-menu":         "1.1.*",
+        "knplabs/knp-menu":         "2.0.*",
         "symfony/framework-bundle": ">=2.0,<2.2-dev"
     },
     "autoload":     {