Minimized BC Breaks

Admin/Admin.php

@@ -1431,6 +1431,11 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
         $menu = $this->menuFactory->createItem('root');
         $menu->setChildrenAttribute('class', 'nav nav-list');
 
+        // Prevents BC break with KnpMenuBundle v1.x
+        if (method_exists($menu, "setCurrentUri")) {
+            $menu->setCurrentUri($this->getRequest()->getBaseUrl().$this->getRequest()->getPathInfo());
+        }
+
         $this->configureSideMenu($menu, $action, $childAdmin);
 
         foreach ($this->getExtensions() as $extension) {

DependencyInjection/SonataAdminExtension.php

@@ -44,6 +44,14 @@ BOOM
             );
         }
 
+        if (!isset($bundles['KnpMenuBundle'])) {
+            throw new \RuntimeException(<<<BOOM
+Boom! you are living on the edge ;) The AdminBundle requires the KnpMenuBundle!
+Please add either ``"knplabs/knp-menu-bundle": "~1.1",`` if you want the stable version or ``"knplabs/knp-menu-bundle": "~2.0@dev"`` and ``"knplabs/knp-menu": "~2.0@dev",`` into your composer.json file if you want the MopaBootstrapBundle-compatible version and add the KnpMenuBundle into the AppKernel');
+BOOM
+            );
+        }
+
         if (isset($bundles['SonataUserBundle'])) {
             // integrate the SonataUserBundle / FOSUserBundle if the bundle exists
             array_unshift($configs, array(

Resources/views/Form/silex_form_div_layout.html.twig

@@ -1,5 +1,11 @@
 {# Widgets #}
 
+{#
+    This file doesn't seem to be used anymore ; commenting it for now in order not to mess with user's configurations.
+    TODO: Remove it and all of its references
+#}
+
+{#
 {% block choice_widget %}
 {% spaceless %}
     {% if expanded %}
@@ -39,7 +45,7 @@
 {% endspaceless %}
 {% endblock form_widget_simple %}
 
-{# Labels #}
+{# Labels #}
 
 {% block form_label %}
 {% spaceless %}
@@ -62,7 +68,7 @@
 {% endspaceless %}
 {% endblock %}
 
-{# Rows #}
+{# Rows #}
 
 {% block form_row %}
 {% spaceless %}
@@ -76,7 +82,7 @@
 {% endspaceless %}
 {% endblock form_row %}
 
-{# Misc #}
+{# Misc #}
 
 {% block form_errors %}
 {% spaceless %}
@@ -97,3 +103,4 @@
     {% endif %}
 {% endspaceless %}
 {% endblock form_errors %}
+#}

composer.json

@@ -29,8 +29,6 @@
         "sensio/generator-bundle": "~2.2",
         "twig/twig": "~1.12",
         "twig/extensions": "~1.0",
-        "knplabs/knp-menu-bundle": "~2.0@dev",
-        "knplabs/knp-menu": "~2.0@dev",
         "sonata-project/jquery-bundle": "1.8.*",
         "sonata-project/exporter": "1.*",
         "sonata-project/block-bundle": "~2.2,>=2.2.7",