Merge pull request #2756 from acrobat/bump-knp-menubundle

[AdminBundle] Bump knplabs/knp-menu-bundle and remove default config

composer.json

@@ -57,7 +57,7 @@
         "incenteev/composer-parameter-handler": "^2.0",
 
         "friendsofsymfony/user-bundle": "^2.0",
-        "knplabs/knp-menu-bundle": "~2.0",
+        "knplabs/knp-menu-bundle": "^3.0",
         "guzzlehttp/guzzle": "~6.1",
         "white-october/pagerfanta-bundle": "~1.0",
         "kunstmaan/google-api-custom": "~1.0",

src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php

@@ -90,11 +90,6 @@ public function load(array $configs, ContainerBuilder $container)
 
     public function prepend(ContainerBuilder $container)
     {
-        $knpMenuConfig['twig'] = true; // set to false to disable the Twig extension and the TwigRenderer
-        $knpMenuConfig['templating'] = false; // if true, enables the helper for PHP templates
-        $knpMenuConfig['default_renderer'] = 'twig'; // The renderer to use, list is also available by default
-        $container->prependExtensionConfig('knp_menu', $knpMenuConfig);
-
         $fosUserOriginalConfig = $container->getExtensionConfig('fos_user');
         if (!isset($fosUserOriginalConfig[0]['db_driver'])) {
             $fosUserConfig['db_driver'] = 'orm'; // other valid values are 'mongodb', 'couchdb'

src/Kunstmaan/AdminBundle/composer.json

@@ -20,7 +20,7 @@
         "doctrine/doctrine-cache-bundle": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "guzzlehttp/guzzle": "~6.1",
-        "knplabs/knp-menu-bundle": "~2.0",
+        "knplabs/knp-menu-bundle": "^3.0",
         "kunstmaan/node-bundle": "~5.2",
         "kunstmaan/utilities-bundle": "~5.2",
         "symfony/acl-bundle": "^1.0",