Merged fixes and fixed voter tests for 2.2 compat.

Author: dantleech

Admin/MenuAdmin.php

@@ -17,8 +17,6 @@
 
 class MenuAdmin extends AbstractMenuNodeAdmin
 {
-    protected $baseRouteName = 'cmf_menu';
-    protected $baseRoutePattern = '/cmf/menu/menu';
 
     /**
      * {@inheritDoc}

Admin/MenuNodeAdmin.php

@@ -21,8 +21,6 @@
 
 class MenuNodeAdmin extends AbstractMenuNodeAdmin
 {
-    protected $baseRouteName = 'cmf_menu_menunode';
-    protected $baseRoutePattern = '/cmf/menu/menunode';
     protected $recursiveBreadcrumbs = true;
 
     /**

Tests/Resources/Controller/CmiTestController.php renamed to Tests/Resources/Controller/VoterController.php

@@ -11,7 +11,7 @@
  *
  * Tests actions for current menu item functionality.
  */
-class CmiTestController extends Controller
+class VoterController extends Controller
 {
     protected function getDm()
     {
@@ -20,7 +20,7 @@ protected function getDm()
 
     public function defaultAction(Request $request)
     {
-        return $this->render('::tests/cmi/default.html.twig');
+        return $this->render('::tests/voter/default.html.twig');
     }
 
     public function requestContentIdentityAction(Request $request)
@@ -30,30 +30,30 @@ public function requestContentIdentityAction(Request $request)
             $content = $this->getDm()->find(null, '/test/content-1');
             $request->attributes->set(DynamicRouter::CONTENT_KEY, $content);
 
-            return $this->render('::tests/cmi/requestContentVoterActive.html.twig', array('content' => $content));
+            return $this->render('::tests/voter/requestContentVoterActive.html.twig', array('content' => $content));
         }
 
-        return $this->render('::tests/cmi/requestContent.html.twig', array('content' => $content));
+        return $this->render('::tests/voter/requestContent.html.twig', array('content' => $content));
     }
 
     public function blogAction(Request $request)
     {
-        return $this->render('::tests/cmi/blog.html.twig');
+        return $this->render('::tests/voter/blog.html.twig');
     }
 
     public function articlesAction(Request $request)
     {
-        return $this->render('::tests/cmi/articles.html.twig');
+        return $this->render('::tests/voter/articles.html.twig');
     }
 
     public function postAction(Request $request)
     {
         $content = $request->get(DynamicRouter::CONTENT_KEY);
-        return $this->render('::tests/cmi/post.html.twig', array('content' => $content));
+        return $this->render('::tests/voter/post.html.twig', array('content' => $content));
     }
 
     public function urlPrefixAction(Request $request)
     {
-        return $this->render('::tests/cmi/requestContent.html.twig', array('content' => $content));
+        return $this->render('::tests/voter/requestContent.html.twig', array('content' => $content));
     }
 }

Tests/Resources/DataFixtures/PHPCR/LoadMenuData.php

@@ -15,6 +15,7 @@
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\ODM\PHPCR\DocumentManager;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu;
 use Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Document\Content;
@@ -26,6 +27,8 @@
 class LoadMenuData implements FixtureInterface, DependentFixtureInterface
 {
     protected $root;
+    protected $menuRoot;
+    protected $routeRoot;
 
     public function getDependencies()
     {
@@ -44,12 +47,12 @@ public function load(ObjectManager $manager)
         $this->routeRoot = $manager->find(null, '/test/routes');
 
         $this->loadMainMenu($manager);
-        $this->loadSideMenu($manager);
+        $this->loadVoterMenu($manager);
 
         $manager->flush();
     }
 
-    protected function loadMainMenu($manager)
+    protected function loadMainMenu(DocumentManager $manager)
     {
         $content = new Content;
         $content->setTitle('Menu Item Content 1');
@@ -129,7 +132,7 @@ protected function loadMainMenu($manager)
         $manager->persist($content);
     }
 
-    protected function loadSideMenu($manager)
+    protected function loadVoterMenu(DocumentManager $manager)
     {
         // test content
         $content = new Content;
@@ -139,7 +142,7 @@ protected function loadSideMenu($manager)
 
         $route = new Route();
         $route->setId('/test/routes/contents/content-1');
-        $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\CmiTestController::requestContentIdentityAction');
+        $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\VoterController::requestContentIdentityAction');
         $route->setContent($content);
         $manager->persist($route);
 
@@ -151,7 +154,7 @@ protected function loadSideMenu($manager)
 
         $route = new Route();
         $route->setId('/test/routes/blog');
-        $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\CmiTestController::blogAction');
+        $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\VoterController::blogAction');
         $route->setContent($blog);
         $manager->persist($route);
 
@@ -163,7 +166,7 @@ protected function loadSideMenu($manager)
 
         $route = new Route();
         $route->setId('/test/routes/blog/my-post');
-        $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\CmiTestController::postAction');
+        $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\VoterController::postAction');
         $route->setContent($post);
         $manager->persist($route);
 
@@ -175,7 +178,7 @@ protected function loadSideMenu($manager)
 
         $articlesRoute = new Route();
         $articlesRoute->setId('/test/routes/articles');
-        $articlesRoute->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\CmiTestController::articlesAction');
+        $articlesRoute->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\VoterController::articlesAction');
         $articlesRoute->setContent($articles);
         $articlesRoute->setOption('currentUriPrefix', '/articles');
         $manager->persist($articlesRoute);
@@ -191,7 +194,7 @@ protected function loadSideMenu($manager)
 
         $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->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\VoterController::postAction');
         $route->setContent($article1);
         $manager->persist($route);
 

Tests/Resources/Document/Content.php

@@ -27,7 +27,7 @@
 class Content implements MenuNodeReferrersInterface, RouteReferrersReadInterface
 {
     /**
-     * @PHPCRODM\Id()
+     * @PHPCRODM\Id(strategy="assigned")
      */
     protected $id;
 

Tests/Resources/app/Resources/views/tests/cmi/_sideMenu.html.twig renamed to Tests/Resources/app/Resources/views/tests/voter/_sideMenu.html.twig

@@ -1,6 +1,6 @@
 {% extends "::layout.html.twig" %}
 {% block content %}
-{% include "::tests/cmi/_sideMenu.html.twig" %}
+{% include "::tests/voter/_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>

Tests/Resources/app/Resources/views/tests/cmi/articles.html.twig renamed to Tests/Resources/app/Resources/views/tests/voter/articles.html.twig

@@ -1,6 +1,6 @@
 {% extends "::layout.html.twig" %}
 {% block content %}
-{% include "::tests/cmi/_sideMenu.html.twig" %}
+{% include "::tests/voter/_sideMenu.html.twig" %}
 <p>
 This is the blog page. Click <a href="{{ path('/test/routes/blog/my-post') }}">To view the blog post.</a>.
 </p>

Tests/Resources/app/Resources/views/tests/cmi/blog.html.twig renamed to Tests/Resources/app/Resources/views/tests/voter/blog.html.twig

@@ -1,6 +1,6 @@
 {% extends "::layout.html.twig" %}
 {% block content %}
-{% include "::tests/cmi/_sideMenu.html.twig" %}
+{% include "::tests/voter/_sideMenu.html.twig" %}
 <h1>Current Menu Item Test</h1>
 <p>The request URI of this page matches the URI for the route associated with the "default behavior" menu item on the left.</p>
 {% endblock %}

Tests/Resources/app/Resources/views/tests/cmi/default.html.twig renamed to Tests/Resources/app/Resources/views/tests/voter/default.html.twig

@@ -1,6 +1,6 @@
 {% extends "::layout.html.twig" %}
 {% block content %}
-{% include "::tests/cmi/_sideMenu.html.twig" %}
+{% include "::tests/voter/_sideMenu.html.twig" %}
 <p>
 This is the blog post page. The "Request Parent Content Identity Voter" menu item should now be highlighted. Click <a href="{{ path('/test/routes/blog') }}">here</a> to return to the blog page.
 </p>