Pārlūkot izejas kodu

Merge pull request #3156 from Soullivaneuh/acl-deps-fix

Make symfony/security-acl as a suggestion
Sullivan SENECHAL 9 gadi atpakaļ
vecāks
revīzija
a0801f1a9a
2 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 3 0
      Resources/doc/reference/installation.rst
  2. 3 2
      composer.json

+ 3 - 0
Resources/doc/reference/installation.rst

@@ -21,6 +21,9 @@ for older versions:
 
 
     Please provide a version constraint for the sonata-project/admin-bundle requirement: dev-master
     Please provide a version constraint for the sonata-project/admin-bundle requirement: dev-master
 
 
+.. note::
+    If you are using Symfony 2.8 and upper, you need to require :code:`symfony/security-acl` to make it working.
+
 Selecting and downloading a storage bundle
 Selecting and downloading a storage bundle
 ------------------------------------------
 ------------------------------------------
 
 

+ 3 - 2
composer.json

@@ -21,7 +21,6 @@
         "symfony/form": "~2.3",
         "symfony/form": "~2.3",
         "symfony/validator": "~2.3",
         "symfony/validator": "~2.3",
         "symfony/security-bundle": "~2.3",
         "symfony/security-bundle": "~2.3",
-        "symfony/security-acl": "~2.3",
         "symfony/routing": "~2.3",
         "symfony/routing": "~2.3",
         "symfony/config": "~2.3",
         "symfony/config": "~2.3",
         "symfony/console": "~2.3",
         "symfony/console": "~2.3",
@@ -45,13 +44,15 @@
         "jms/translation-bundle": "~1.1",
         "jms/translation-bundle": "~1.1",
         "sensio/generator-bundle": "~2.3",
         "sensio/generator-bundle": "~2.3",
         "symfony/yaml": "~2.3",
         "symfony/yaml": "~2.3",
+        "symfony/security-acl": "~2.4",
         "sonata-project/intl-bundle": "~2.1",
         "sonata-project/intl-bundle": "~2.1",
         "symfony/phpunit-bridge": "~2.7|~3.0"
         "symfony/phpunit-bridge": "~2.7|~3.0"
     },
     },
     "suggest": {
     "suggest": {
         "jms/translation-bundle": "Extract message keys from Admins",
         "jms/translation-bundle": "Extract message keys from Admins",
         "sensio/generator-bundle": "Add sonata:admin:generate command",
         "sensio/generator-bundle": "Add sonata:admin:generate command",
-        "sonata-project/intl-bundle": "Add localized date and number into the list"
+        "sonata-project/intl-bundle": "Add localized date and number into the list",
+        "symfony/security-acl": "To make sonata working with Symfony >=2.8"
     },
     },
     "autoload": {
     "autoload": {
         "psr-4": { "Sonata\\AdminBundle\\": "" }
         "psr-4": { "Sonata\\AdminBundle\\": "" }