Added URIPrefix scenario

Author: dantleech

DependencyInjection/CmfMenuExtension.php

@@ -45,6 +45,7 @@ public function load(array $configs, ContainerBuilder $container)
     public function loadVoters($config, XmlFileLoader $loader, ContainerBuilder $container)
     {
         $loader->load('voters.xml');
+
         if (isset($config['voters']['content_identity'])) {
             if (empty($config['voters']['content_identity']['content_key'])) {
                 if (! class_exists('Symfony\\Cmf\\Bundle\\RoutingBundle\\Routing\\DynamicRouter')) {
@@ -59,7 +60,7 @@ public function loadVoters($config, XmlFileLoader $loader, ContainerBuilder $con
             $container->removeDefinition('cmf_menu.current_item_voter.content_identity');
         }
 
-        if (! isset($config['voters']['uri_prefix'])) {
+        if (!array_key_exists('uri_prefix', $config['voters'])) {
             $container->removeDefinition('cmf_menu.current_item_voter.uri_prefix');
         }
     }

Tests/Resources/Controller/CmiTestController.php

@@ -41,6 +41,11 @@ public function blogAction(Request $request)
         return $this->render('::tests/cmi/blog.html.twig');
     }
 
+    public function articlesAction(Request $request)
+    {
+        return $this->render('::tests/cmi/articles.html.twig');
+    }
+
     public function postAction(Request $request)
     {
         $content = $request->get(DynamicRouter::CONTENT_KEY);

Tests/Resources/DataFixtures/PHPCR/LoadMenuData.php

@@ -167,6 +167,34 @@ protected function loadSideMenu($manager)
         $route->setContent($post);
         $manager->persist($route);
 
+        // test articles
+        $articles = new Content;
+        $articles->setTitle('Articles Index');
+        $articles->setId('/test/articles');
+        $manager->persist($articles);
+
+        $articlesRoute = new Route();
+        $articlesRoute->setId('/test/routes/articles');
+        $articlesRoute->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\CmiTestController::articlesAction');
+        $articlesRoute->setContent($articles);
+        $articlesRoute->setOption('currentUriPrefix', '/articles');
+        $manager->persist($articlesRoute);
+
+        $article1 = new Content();
+        $article1->setTitle('Article 1');
+        $article1->setId('/test/article-1');
+        $manager->persist($article1);
+
+        $route = new Route();
+        $route->setId('/test/routes/articles/some-category');
+        $manager->persist($route);
+
+        $route = new Route();
+        $route->setId('/test/routes/articles/some-category/article-1');
+        $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\CmiTestController::postAction');
+        $route->setContent($article1);
+        $manager->persist($route);
+
         // menu items
         $menu = new Menu;
         $menu->setName('side-menu');
@@ -192,6 +220,7 @@ protected function loadSideMenu($manager)
         $menuNode->setParent($menu);
         $menuNode->setLabel('URI Prefix Voter');
         $menuNode->setName('uri-prefix-voter');
+        $menuNode->setContent($articlesRoute);
         $manager->persist($menuNode);
 
         $menuNode = new MenuNode;

Tests/Resources/app/Resources/views/tests/cmi/articles.html.twig

@@ -0,0 +1,8 @@
+{% extends "::layout.html.twig" %}
+{% block content %}
+{% include "::tests/cmi/_sideMenu.html.twig" %}
+<p>
+This is the articles page. Click <a href="{{ path('/test/routes/articles/some-category/article-1') }}">To view the article</a>.
+</p>
+{% endblock %}
+

Tests/Resources/app/config/cmf_menu.yml

@@ -11,7 +11,8 @@ cmf_menu:
             use_sonata_admin: true
             menu_basepath: /test/menus
     voters:
-        content_identity: ~
+        content_identity: true
+        uri_prefix: ~
 
 cmf_routing:
     dynamic: