[FrameworkBundle] Fix framework bundle lock configuration not working as expected #31198
Conversation
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Outdated
Show resolved
Hide resolved
|
ping @jderusse |
There was a problem hiding this comment.
I'm not an expert on symfony configuration, but it's look like we've re-implemented fixXmlConfig + useAttributeAsKey('name') and got the feeling that business logic is dupliacted in "resource" and "resources".
Side appart that comment, I'm 👍 with the test suite: which is the expected behavior.
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Outdated
Show resolved
Hide resolved
|
@jderusse Yep, I agree with you, this is pretty much a re-implementation of fixXmlConfig + useAttributeAsKey('name'), however because of the beforeNormalization rules that were here before, I haven't been able to find a better solution. If anyone has any ideas please, let me know. Regardless, the fact remains that currently xml configurations don't work at all. |
|
I would rather add a check for the singular |
|
@stof Tried your approach & you were right, the end result is now a bit cleaner HypeMC@662d394 . Not sure whether to update this PR since it's already approved or to open a new one. |
|
Please update! |
|
@nicolas-grekas Done. |
| ->then(function ($v) { return $v + ['enabled' => true]; }) | ||
| ->end() | ||
| ->beforeNormalization() | ||
| ->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']) && !isset($v['resource']); }) |
There was a problem hiding this comment.
&& !isset($v['resources']) is duplicated right?
|
Thank you @HypeMC. |
…not working as expected (HypeMC) This PR was squashed before being merged into the 3.4 branch (closes #31198). Discussion ---------- [FrameworkBundle] Fix framework bundle lock configuration not working as expected | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31197 | License | MIT | Doc PR | symfony/symfony-docs#11465 & symfony/symfony-docs#11466 This fixes #31197 and makes the lock configuration work with installations that are not full stack ones and configurations that use xml files. Commits ------- c7af2df [FrameworkBundle] Fix framework bundle lock configuration not working as expected
This fixes #31197 and makes the lock configuration work with installations that are not full stack ones and configurations that use xml files.