Skip to content

Commit

Permalink
Revert "Make symfony/security-acl as a suggestion"
Browse files Browse the repository at this point in the history
This reverts commit a0a3157.
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
  • Loading branch information
greg0ire committed Jan 31, 2016
1 parent 3294a3a commit 9b0bd25
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 0 additions & 4 deletions Resources/doc/reference/installation.rst
Expand Up @@ -21,10 +21,6 @@ for older versions:
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
------------------------------------------

Expand Down
5 changes: 2 additions & 3 deletions composer.json
Expand Up @@ -30,6 +30,7 @@
"symfony/translation":"~2.3|~3.0",
"symfony/dependency-injection": "~2.3,>=2.3.3|~3.0",
"symfony/property-access": "~2.3|~3.0",
"symfony/security-acl": "~2.3|~3.0",
"twig/twig": "~1.23",
"twig/extensions": "~1.0",
"sonata-project/exporter": "~1.0",
Expand All @@ -42,15 +43,13 @@
"require-dev": {
"sensio/generator-bundle": "~2.3|~3.0",
"symfony/yaml": "~2.3|~3.0",
"symfony/security-acl": "~2.4|~3.0",
"sonata-project/intl-bundle": "dev-master",
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"suggest": {
"jms/translation-bundle": "Extract message keys from Admins",
"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": {
"psr-4": { "Sonata\\AdminBundle\\": "" }
Expand Down

0 comments on commit 9b0bd25

Please sign in to comment.