feature #16694 [SecurityBundle] make ACL an optional dependency (Tobion)

fabpot · fabpot · commit d258ee80c2f7 · 2015-11-26T21:11:02.000+01:00
This PR was merged into the 3.0-dev branch. Discussion ---------- [SecurityBundle] make ACL an optional dependency | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | - Fixes #14718 (comment). Together with doctrine/DoctrineCacheBundle#77 we do not have ACL in the symfony-standard 3.0 by default anymore. Commits ------- fc66283 [SecurityBundle] make ACL an optional dependency
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -116,6 +116,10 @@ public function load(array $configs, ContainerBuilder $container)
 
     private function aclLoad($config, ContainerBuilder $container)
     {
+        if (!interface_exists('Symfony\Component\Security\Acl\Model\AclInterface')) {
+            throw new \LogicException('You must install symfony/security-acl in order to use the ACL functionality.');
+        }
+
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('security_acl.xml');
 
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -18,7 +18,6 @@
     "require": {
         "php": ">=5.5.9",
         "symfony/security": "~2.8|~3.0",
-        "symfony/security-acl": "~2.8|~3.0",
         "symfony/http-kernel": "~2.8|~3.0",
         "symfony/polyfill-php70": "~1.0"
     },
@@ -30,6 +29,7 @@
         "symfony/form": "~2.8|~3.0",
         "symfony/framework-bundle": "~2.8|~3.0",
         "symfony/http-foundation": "~2.8|~3.0",
+        "symfony/security-acl": "~2.8|~3.0",
         "symfony/twig-bundle": "~2.8|~3.0",
         "symfony/twig-bridge": "~2.8|~3.0",
         "symfony/process": "~2.8|~3.0",
@@ -39,6 +39,9 @@
         "doctrine/doctrine-bundle": "~1.4",
         "twig/twig": "~1.23|~2.0"
     },
+    "suggest": {
+        "symfony/security-acl": "For using the ACL functionality of this bundle"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
         "exclude-from-classmap": [

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,10 @@ public function load(array $configs, ContainerBuilder $container)`
`116`	`116`
`117`	`117`	`private function aclLoad($config, ContainerBuilder $container)`
`118`	`118`	`{`
	`119`	`+ if (!interface_exists('Symfony\Component\Security\Acl\Model\AclInterface')) {`
	`120`	`+ throw new \LogicException('You must install symfony/security-acl in order to use the ACL functionality.');`
	`121`	`+ }`
	`122`	`+`
`119`	`123`	`$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));`
`120`	`124`	`$loader->load('security_acl.xml');`
`121`	`125`