Merge pull request #238 from Nek-/follow-knpmenu

Updated to KnpMenu 2.0.0

Author: pzaloznyi

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2.0.0 (2013-XX-XX)
+## 2.0.0 (2014-07-18)
 
 * Updated for changes done in KnpMenu beta
 

Resources/doc/index.md

@@ -34,8 +34,7 @@ Add on composer.json (see http://getcomposer.org/)
 
     "require" :  {
         // ...
-        "knplabs/knp-menu": "2.0.*@dev",
-        "knplabs/knp-menu-bundle": "2.0.*@dev"
+        "knplabs/knp-menu-bundle": "~2.0"
     }
 
 #### Method b) Using the `deps` file (symfony 2.0 pattern)

Tests/EventListener/VoterInitializerListenerTest.php

@@ -17,7 +17,7 @@ public function testHandleSubRequest()
             ->method('getRequestType')
             ->will($this->returnValue(HttpKernelInterface::SUB_REQUEST));
 
-        $voter = $this->getMockBuilder('Knp\Menu\Silex\Voter\RouteVoter')
+        $voter = $this->getMockBuilder('Knp\Menu\Matcher\Voter\RouteVoter')
             ->disableOriginalConstructor()
             ->getMock();
         $voter->expects($this->never())
@@ -43,7 +43,7 @@ public function testHandleMasterRequest()
             ->method('getRequest')
             ->will($this->returnValue($request));
 
-        $voter = $this->getMockBuilder('Knp\Menu\Silex\Voter\RouteVoter')
+        $voter = $this->getMockBuilder('Knp\Menu\Matcher\Voter\RouteVoter')
             ->disableOriginalConstructor()
             ->getMock();
         $voter->expects($this->once())

composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require":      {
-        "knplabs/knp-menu":         "~2.0, >=2.0.0-beta1",
+        "knplabs/knp-menu":         "~2.0",
         "symfony/framework-bundle": "~2.0"
     },
     "autoload":     {