Enableable ArrayNodeDefinition is disabled for empty configuration #25789
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
linaori
reviewed
Jan 15, 2018
| @@ -226,7 +226,9 @@ public function canBeEnabled() | |||
| ->beforeNormalization() | |||
| ->ifArray() | |||
| ->then(function ($v) { | |||
| $v['enabled'] = isset($v['enabled']) ? $v['enabled'] : true; | |||
| if (!isset($v['enabled'])) { | |||
| $v['enabled'] = empty($v) ? false : true; | |||
There was a problem hiding this comment.
Can also be written as $v['enabled'] = !empty($v);
There was a problem hiding this comment.
damn, you're right :D
Simperfit
approved these changes
Jan 15, 2018
xabbuh
approved these changes
Jan 16, 2018
fabpot
approved these changes
Jan 17, 2018
|
Thank you @kejwmen. |
fabpot
added a commit
that referenced
this pull request
Jan 17, 2018
…guration (kejwmen) This PR was squashed before being merged into the 2.7 branch (closes #25789). Discussion ---------- Enableable ArrayNodeDefinition is disabled for empty configuration | Q | A | ------------- | --- | Branch? | 2.7+ | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25760 | License | MIT Fixes #25760. Currently, documented behavior is not true: https://github.com/symfony/symfony/blob/70c8c2d47bd71861c8205985a17e68cedf828e1f/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php#L207-L208 Commits ------- a6a330d Enableable ArrayNodeDefinition is disabled for empty configuration
xabbuh
added a commit
to xabbuh/symfony
that referenced
this pull request
Jan 19, 2018
The failing tests relied on the assets integration being enabled. Since we never did enable this explicitly, the assets related definitions are removed now that symfony#25789 was merged which fixed symfony#25760.
chalasr
added a commit
that referenced
this pull request
Jan 19, 2018
This PR was merged into the 3.3 branch. Discussion ---------- [FrameworkBundle] fix DI extension tests | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The failing tests relied on the assets integration being enabled. Since we never did enable this explicitly, the assets related definitions are removed now that #25789 was merged which fixed #25760. Commits ------- 1cb8f69 [FrameworkBundle] fix DI extension tests
jakzal
reviewed
Jan 21, 2018
| @@ -226,7 +226,9 @@ public function canBeEnabled() | |||
| ->beforeNormalization() | |||
| ->ifArray() | |||
| ->then(function ($v) { | |||
| $v['enabled'] = isset($v['enabled']) ? $v['enabled'] : true; | |||
| if (!isset($v['enabled'])) { | |||
| $v['enabled'] = !empty($v); | |||
There was a problem hiding this comment.
Should probably be is_array($v) && !empty($v) to cover the foo: ~ case, which should work as enable.
There was a problem hiding this comment.
What tests should we add to make sure it won't happen in the future? Component tests cover null case already. ~ is just a null, right?
There was a problem hiding this comment.
forget my comment. This callback is only triggered for arrays ;)
There was a problem hiding this comment.
Looks like ~ in yaml is represented by empty array (?), simple reproducer is available here
nicolas-grekas
added a commit
that referenced
this pull request
Jan 21, 2018
* 2.7: [HttpFoundation] fixed return type of method HeaderBag::get [HttpFoundation] Added "resource" type on Request::create docblock Revert "bug #25789 Enableable ArrayNodeDefinition is disabled for empty configuration (kejwmen)" Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)" [Validator] add missing parent isset and add test
nicolas-grekas
added a commit
that referenced
this pull request
Jan 21, 2018
* 2.8: [HttpFoundation] fixed return type of method HeaderBag::get [HttpFoundation] Added "resource" type on Request::create docblock Revert "bug #25789 Enableable ArrayNodeDefinition is disabled for empty configuration (kejwmen)" Formatting fix in upgrade 3.0 document Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)" [Validator] add missing parent isset and add test
nicolas-grekas
added a commit
that referenced
this pull request
Jan 21, 2018
* 3.3: Have weak_vendors ignore deprecations from outside [HttpFoundation] fixed return type of method HeaderBag::get [HttpFoundation] Added "resource" type on Request::create docblock [Process] Skip environment variables with false value in Process Revert "bug #25789 Enableable ArrayNodeDefinition is disabled for empty configuration (kejwmen)" Formatting fix in upgrade 3.0 document don't split lines on carriage returns when dumping Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)" [DI] compilation perf tweak [Validator] Conflict with egulias/email-validator 2.0 [Validator] add missing parent isset and add test
nicolas-grekas
added a commit
that referenced
this pull request
Jan 21, 2018
* 3.4: Have weak_vendors ignore deprecations from outside [HttpFoundation] fixed return type of method HeaderBag::get [HttpFoundation] Added "resource" type on Request::create docblock [Process] Skip environment variables with false value in Process Revert "bug #25789 Enableable ArrayNodeDefinition is disabled for empty configuration (kejwmen)" Formatting fix in upgrade 3.0 document don't split lines on carriage returns when dumping Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)" [DI] compilation perf tweak [Validator] Conflict with egulias/email-validator 2.0 [Validator] add missing parent isset and add test
nicolas-grekas
added a commit
that referenced
this pull request
Jan 21, 2018
* 4.0: Have weak_vendors ignore deprecations from outside [HttpFoundation] fixed return type of method HeaderBag::get [HttpFoundation] Added "resource" type on Request::create docblock [Console] Fix using finally where the catch can also fail [Process] Skip environment variables with false value in Process Revert "bug #25789 Enableable ArrayNodeDefinition is disabled for empty configuration (kejwmen)" Formatting fix in upgrade 3.0 document don't split lines on carriage returns when dumping trim spaces from unquoted scalar values Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)" [DI] compilation perf tweak [Validator] Conflict with egulias/email-validator 2.0 [Validator] add missing parent isset and add test
This was referenced Jan 29, 2018
Merged
Merged
Merged
Merged
Merged
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.
Fixes #25760.
Currently, documented behavior is not true:
symfony/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
Lines 207 to 208 in 70c8c2d