8000 Improvements after review · HypeMC/symfony@662d394 · GitHub
[go: up one dir, main page]
Skip to content

Commit 662d394

Browse files
HypeMCHypeMC
committed
Improvements after review
1 parent b38d1ae commit 662d394

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -933,24 +933,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
933933
->then(function ($v) { return $v + ['enabled' => true]; })
934934
->end()
935935
->beforeNormalization()
936-
->ifTrue(function ($v) { return \is_array($v) && isset($v['resource']); })
937-
->then(function ($v) {
938-
$resources = [];
939-
foreach ($v['resource'] as $resource) {
940-
$resources = array_merge_recursive(
941-
$resources,
942-
\is_array($resource) ? [$resource['name'] => $resource['value']] : ['default' => $resource]
943-
);
944-
}
945-
946-
return [
947-
'enabled' => $v['enabled'],
948-
'resources' => $resources,
949-
];
950-
})
951-
->end()
952-
->beforeNormalization()
953-
->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']); })
936+
->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']) && !isset($v['resource']); })
954937
->then(function ($v) {
955938
$e = $v['enabled'];
956939
unset($v['enabled']);
@@ -959,6 +942,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
959942
})
960943
->end()
961944
->addDefaultsIfNotSet()
945+
->fixXmlConfig('resource')
962946
->children()
963947
->arrayNode('resources')
964948
->requiresAtLeastOneElement()
@@ -968,7 +952,19 @@ private function addLockSection(ArrayNodeDefinition $rootNode)
968952
->end()
969953
->beforeNormalization()
970954
->ifTrue(function ($v) { return \is_array($v) && array_keys($v) === range(0, \count($v) - 1); })
971-
->then(function ($v) { return ['default' => 1 === \count($v) && isset($v[0]) && \is_array($v[0]) ? $v[0] : $v]; })
955+
->then(function ($v) {
956+
$resources = [];
957+
foreach ($v as $resource) {
958+
$resources = array_merge_recursive(
959+
$resources,
960+
\is_array($resource) && isset($resource['name'])
961+
? [$resource['name'] => $resource['value']]
962+
: ['default' => $resource]
963+
);
964+
}
965+
966+
return $resources;
967+
})
972968
->end()
973969
->prototype('array')
974970
->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()

0 commit comments

Comments
 (0)
0