Browse Source

Revert "Make symfony/security-acl as a suggestion"

This reverts commit a0a3157a34e49e4f32069b9343bb61ead5ab42ff.
Do not pretend ACLs are optional when they are really not. The admin
class implements an interface from the ACL package. This means that
anyone that uses an admin (so any user of the package, really), needs
to have that interface (and the ACL package).
Fixes #3511
Grégoire Paris 9 years ago
parent
commit
9b0bd257ad
2 changed files with 2 additions and 7 deletions
  1. 0 4
      Resources/doc/reference/installation.rst
  2. 2 3
      composer.json

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

@@ -21,10 +21,6 @@ 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
 ------------------------------------------
 ------------------------------------------
 
 

+ 2 - 3
composer.json

@@ -30,6 +30,7 @@
         "symfony/translation":"~2.3|~3.0",
         "symfony/translation":"~2.3|~3.0",
         "symfony/dependency-injection": "~2.3,>=2.3.3|~3.0",
         "symfony/dependency-injection": "~2.3,>=2.3.3|~3.0",
         "symfony/property-access": "~2.3|~3.0",
         "symfony/property-access": "~2.3|~3.0",
+        "symfony/security-acl": "~2.3|~3.0",
         "twig/twig": "~1.23",
         "twig/twig": "~1.23",
         "twig/extensions": "~1.0",
         "twig/extensions": "~1.0",
         "sonata-project/exporter": "~1.0",
         "sonata-project/exporter": "~1.0",
@@ -42,15 +43,13 @@
     "require-dev": {
     "require-dev": {
         "sensio/generator-bundle": "~2.3|~3.0",
         "sensio/generator-bundle": "~2.3|~3.0",
         "symfony/yaml": "~2.3|~3.0",
         "symfony/yaml": "~2.3|~3.0",
-        "symfony/security-acl": "~2.4|~3.0",
         "sonata-project/intl-bundle": "dev-master",
         "sonata-project/intl-bundle": "dev-master",
         "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",
-        "symfony/security-acl": "To make sonata working with Symfony >=2.8"
+        "sonata-project/intl-bundle": "Add localized date and number into the list"
     },
     },
     "autoload": {
     "autoload": {
         "psr-4": { "Sonata\\AdminBundle\\": "" }
         "psr-4": { "Sonata\\AdminBundle\\": "" }