[Config] Allow scalar configuration in PHP Configuration

symfony · nicolas-grekas · May 17, 2022 · Nov 20, 2021 · May 11, 2022 · May 17, 2022
commit 1c176e160396d5f60ea9363fbcdfd9c074fd3671
diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -435,8 +435,7 @@ private function buildConstructor(ClassBuilder $class): void
 
         $class->addMethod('__construct', '
 public function __construct(array $value = [])
-{
-'.$body.'
+{'.$body.'
 }');
     }
 

diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/Placeholders.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/Placeholders.php
@@ -15,7 +15,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->children()
                 ->booleanNode('enabled')->defaultFalse()->end()
                 ->floatNode('favorite_float')->end()
-                 ->arrayNode('good_integers')
+                ->arrayNode('good_integers')
                     ->integerPrototype()->end()
                 ->end()
             ->end()

diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.config.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.config.php
@@ -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');
+};
diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.output.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.output.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'simple_array' => 'foo',
+    'keyed_array' => [
+        'key' => 'value'
+    ],
+    'list_object' => [
+        'bar',
+        'baz',
+        ['name' => 'qux'],
+    ],
+];
diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/ScalarNormalizedTypes.php
@@ -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;
+    }
+}
diff --git a/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php b/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php
@@ -56,6 +56,7 @@ protected function tearDown(): void
     public function fixtureNames()
     {
         $array = [
+            'ScalarNormalizedTypes' => 'scalar_normalized_types',
             'PrimitiveTypes' => 'primitive_types',
             'VariableType' => 'variable_type',
             'AddToList' => 'add_to_list',