Merge pull request KnpLabs#64 from bamarni/patch-1

[RouterAwareFactory] pushing the route to the extras

Author: stof

composer.json

@@ -39,5 +39,6 @@
         "branch-alias": {
             "dev-master": "2.0.x-dev"
         }
-    }
+    },
+    "minimum-stability": "dev"
 }

src/Knp/Menu/Silex/RouterAwareFactory.php

@@ -23,6 +23,9 @@ public function createItem($name, array $options = array())
             $params = isset($options['routeParameters']) ? $options['routeParameters'] : array();
             $absolute = isset($options['routeAbsolute']) ? $options['routeAbsolute'] : false;
             $options['uri'] = $this->generator->generate($options['route'], $params, $absolute);
+
+            // adding the item route to the extras under the 'routes' key (for the Silex RouteVoter)
+            $options = array_merge_recursive(array('extras' => array('routes' => array($options['route']))), $options);
         }
 
         return parent::createItem($name, $options);

tests/Knp/Menu/Tests/Silex/KnpMenuServiceProviderTest.php

@@ -68,6 +68,12 @@ public function testRenderCurrentWithTwig()
 
         $request = Request::create('/twig');
         $response = $app->handle($request);
+        $this->assertEquals('<ul class="nav"><li class="current first"><a href="/twig">Home</a></li><li class="last"><a href="http://knplabs.com">KnpLabs</a></li></ul>', $response->getContent());
+
+        $app = $this->bootstrapApp();
+
+        $request = Request::create('/other-twig');
+        $response = $app->handle($request);
         $this->assertEquals('<ul class="nav"><li class="first"><a href="/twig">Home</a></li><li class="current last"><a href="http://knplabs.com">KnpLabs</a></li></ul>', $response->getContent());
     }
 
@@ -89,7 +95,7 @@ private function bootstrapApp()
 
             $root = $factory->createItem('root', array('childrenAttributes' => array('class' => 'nav')));
             $root->addChild('home', array('route' => 'homepage', 'label' => 'Home'));
-            $root->addChild('KnpLabs', array('uri' => 'http://knplabs.com', 'extras' => array('routes' => 'homepage')));
+            $root->addChild('KnpLabs', array('uri' => 'http://knplabs.com', 'extras' => array('routes' => 'other_route')));
 
             return $root;
         };
@@ -109,6 +115,10 @@ private function bootstrapApp()
             return $app['twig']->render('main', array('renderer' => 'twig'));
         })->bind('homepage');
 
+        $app->get('/other-twig', function (Application $app) {
+            return $app['twig']->render('main', array('renderer' => 'twig'));
+        })->bind('other_route');
+
         $app->get('/list', function (Application $app) {
             return $app['twig']->render('main', array('renderer' => 'list'));
         })->bind('list');

tests/Knp/Menu/Tests/Silex/RouterAwareFactoryTest.php

@@ -51,4 +51,16 @@ public function testCreateItemWithAbsoluteRoute()
         $item = $factory->createItem('test_item', array('route' => 'homepage', 'routeAbsolute' => true));
         $this->assertEquals('http://php.net', $item->getUri());
     }
+
+    public function testCreateItemAppendsRouteUnderExtras()
+    {
+        $generator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+        $factory = new RouterAwareFactory($generator);
+
+        $item = $factory->createItem('test_item', array('route' => 'homepage'));
+        $this->assertEquals(array('homepage'), $item->getExtra('routes'));
+
+        $item = $factory->createItem('test_item', array('route' => 'homepage', 'extras' => array('routes' => array('other_page'))));
+        $this->assertContains('homepage', $item->getExtra('routes'));
+    }
 }