소스 검색

update knp-bundle dependencies

Thomas Rabaix 11 년 전
부모
커밋
0100f0ea5a
2개의 변경된 파일3개의 추가작업 그리고 15개의 파일을 삭제
  1. 0 14
      DependencyInjection/SonataAdminExtension.php
  2. 3 1
      composer.json

+ 0 - 14
DependencyInjection/SonataAdminExtension.php

@@ -44,20 +44,6 @@ BOOM
             );
             );
         }
         }
 
 
-        if (!isset($bundles['KnpMenuBundle'])) {
-            throw new \RuntimeException(<<<BOOM
-The AdminBundle requires the KnpMenuBundle, but you need to choose your version (and choose wisely, fellow padawan!).
-Please fill in your composer.json file by adding either:
-``"knplabs/knp-menu-bundle": "~1.1"``
-if you want the stable version or:
-``"knplabs/knp-menu-bundle": "~2.0@dev",
-"knplabs/knp-menu": "~2.0@dev"``
-if you want the MopaBootstrapBundle-compatible version. You'll need to add the KnpMenuBundle into the AppKernel as well.
-Follow the KnpMenuBundle install documentation, to be sure you're not forgetting anything!');
-BOOM
-            );
-        }
-
         if (isset($bundles['SonataUserBundle'])) {
         if (isset($bundles['SonataUserBundle'])) {
             // integrate the SonataUserBundle / FOSUserBundle if the bundle exists
             // integrate the SonataUserBundle / FOSUserBundle if the bundle exists
             array_unshift($configs, array(
             array_unshift($configs, array(

+ 3 - 1
composer.json

@@ -33,7 +33,9 @@
         "sonata-project/exporter": "1.*",
         "sonata-project/exporter": "1.*",
         "sonata-project/block-bundle": "~2.2,>=2.2.7",
         "sonata-project/block-bundle": "~2.2,>=2.2.7",
         "sonata-project/core-bundle": "~2.2@dev",
         "sonata-project/core-bundle": "~2.2@dev",
-        "doctrine/common": "~2.2"
+        "doctrine/common": "~2.2",
+        "knplabs/knp-menu-bundle": ">=1.1.0,<3.0.0",
+        "knplabs/knp-menu": ">=1.1.0,<3.0.0"
     },
     },
     "require-dev": {
     "require-dev": {
         "jms/translation-bundle": "*@dev",
         "jms/translation-bundle": "*@dev",