-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[Config] Allow scalar configuration in PHP Configuration #46328
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
[Config] Allow scalar configuration in PHP Configuration
- Loading branch information
commit 1c176e160396d5f60ea9363fbcdfd9c074fd3671
There are no files selected for viewing
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
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
12 changes: 12 additions & 0 deletions
12
src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.config.php
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?php | ||
|
||
use Symfony\Config\ScalarNormalizedTypesConfig; | ||
|
||
return static function (ScalarNormalizedTypesConfig $config) { | ||
$config | ||
->simpleArray('foo') | ||
->keyedArray('key', 'value') | ||
->listObject('bar') | ||
->listObject('baz') | ||
->listObject()->name('qux'); | ||
}; |
13 changes: 13 additions & 0 deletions
13
src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.output.php
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?php | ||
|
||
return [ | ||
'simple_array' => 'foo', | ||
'keyed_array' => [ | ||
'key' => 'value' | ||
], | ||
'list_object' => [ | ||
'bar', | ||
'baz', | ||
['name' => 'qux'], | ||
], | ||
]; |
77 changes: 77 additions & 0 deletions
77
src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.php
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
<?php | ||
|
||
namespace Symfony\Component\Config\Tests\Builder\Fixtures; | ||
|
||
use Symfony\Component\Config\Definition\Builder\TreeBuilder; | ||
use Symfony\Component\Config\Definition\ConfigurationInterface; | ||
|
||
class ScalarNormalizedTypes implements ConfigurationInterface | ||
{ | ||
public function getConfigTreeBuilder(): TreeBuilder | ||
{ | ||
$tb = new TreeBuilder('scalar_normalized_types'); | ||
$rootNode = $tb->getRootNode(); | ||
$rootNode | ||
->children() | ||
->arrayNode('simple_array') | ||
->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end() | ||
->prototype('scalar')->end() | ||
->end() | ||
->arrayNode('keyed_array') | ||
->useAttributeAsKey('name') | ||
->prototype('array') | ||
->beforeNormalization() | ||
->ifString()->then(function ($v) { return [$v]; }) | ||
->end() | ||
->prototype('scalar')->end() | ||
->end() | ||
->end() | ||
->arrayNode('list_object') | ||
->beforeNormalization() | ||
->always() | ||
->then(function ($values) { | ||
//inspired by Workflow places | ||
if (isset($values[0]) && \is_string($values[0])) { | ||
return array_map(function (string $value) { | ||
return ['name' => $value]; | ||
}, $values); | ||
} | ||
|
||
if (isset($values[0]) && \is_array($values[0])) { | ||
return $values; | ||
} | ||
|
||
foreach ($values as $name => $value) { | ||
if (\is_array($value) && \array_key_exists('name', $value)) { | ||
continue; | ||
} | ||
$value['name'] = $name; | ||
$values[$name] = $value; | ||
} | ||
|
||
return array_values($values); | ||
}) | ||
->end() | ||
->isRequired() | ||
->requiresAtLeastOneElement() | ||
->prototype('array') | ||
->children() | ||
->scalarNode('name') | ||
->isRequired() | ||
->cannotBeEmpty() | ||
->end() | ||
->arrayNode('data') | ||
->normalizeKeys(false) | ||
->defaultValue([]) | ||
->prototype('variable') | ||
->end() | ||
->end() | ||
->end() | ||
->end() | ||
->end() | ||
->end() | ||
; | ||
|
||
return $tb; | ||
} | ||
} |
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
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.
Uh oh!
There was an error while loading. Please reload this page.