Continuation of #23624 #23801
Closed
Continuation of #23624 #23801
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chalasr
reviewed
Aug 6, 2017
| @@ -114,6 +116,9 @@ public function load(array $configs, ContainerBuilder $container) | |||
| // load ACL | |||
| if (isset($config['acl'])) { | |||
| $this->aclLoad($config['acl'], $container); | |||
| } else { | |||
| $container->removeDefinition(InitAclCommand::class); | |||
There was a problem hiding this comment.
broken if console not available, should go in the previous if (console.xml loading) and acl loading be moved just before console loading
There was a problem hiding this comment.
not sure.. removeDefinition is non-fatal. Did this for translations, routing, etc. as well.
chalasr
approved these changes
Aug 6, 2017
| */ | ||
| public function isEnabled() | ||
| { | ||
| if (null !== $this->connection) { | ||
| return parent::isEnabled(); | ||
| } | ||
| if (!$this->getContainer()->has('security.acl.dbal.connection')) { |
There was a problem hiding this comment.
if (!$this->connection && ..) instead?
| @@ -114,6 +116,9 @@ public function load(array $configs, ContainerBuilder $container) | |||
| // load ACL | |||
| if (isset($config['acl'])) { | |||
| $this->aclLoad($config['acl'], $container); | |||
| } else { | |||
| $container->removeDefinition(InitAclCommand::class); | |||
chalasr
reviewed
Aug 6, 2017
|
|
||
| return; | ||
| } | ||
|
|
||
| parent::__construct(); |
nicolas-grekas
approved these changes
Aug 6, 2017
|
Not sure what appveyor complains about =/ |
|
Thank you @ro0NL. |
fabpot
added a commit
to symfony/acl-bundle
that referenced
this pull request
Sep 26, 2017
This PR was merged into the 2.8-dev branch. Discussion ---------- Initial extract from SecurityBundle Now that 3.0 is done and 3.1 is in feature freeze, it was a bit easier to extract the ACL part from the security bundle. Note that this is a mere extract and nothing besides of travis.yml is added. _Replaces #1_ Commits ------- 6263c7c Fixed some incorrect references 933b129 Merge pull request #2 from chalasr/feature/initial-extract feccd34 Do not prepend security config 094c4b7 Remove framework-bundle requirement 25185fa Remove security_ prefix from security_*.xml 3e25239 Remove symfony/symfony BC layers from console commands 95ee777 Fix composer requirements 61047c5 Disable bundle commands locator aaff4a7 Added a test-case for the BC layer 6a601de Fixes based on feedback 6eef9a0 Added asset d8eb3a8 Added security csrf 11dc2e6 Added the yaml component 61669b0 Fix lowest version of security-acl 88d9eed port of symfony/symfony#23801 4ef69f4 Changed minimum sf version to 3.3 45a1546 Added validator as dev-req 01ef784 Load the doctrine bundle as well 5f6d0b2 Initial extract from SecurityBundle
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #23624 (comment)
cc @chalasr
Also included service injection for init:acl + set:acl and simplification of lint:xliff + lintt:yaml.
Btw, i think init:acl needs to be renamed to acl:init :)