Transform default scalar prototype in variable prototype to allow custom defaults

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 829a1aa4c571a65301ec0d96d8c46020cfa813f6..3ceb22ff5dc46648e9f9ce98c4dbea92d8bc8725 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
 <?php declare(strict_types=1);
 
 /*

- * This file is part of the Rapsys PackBundle package.
+ * This file is part of the Rapsys UserBundle package.

  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *
  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *


@@ -79,6 +79,7 @@ class Configuration implements ConfigurationInterface {
                        ],
                        'context' => [],
                        'edit' => [
                        ],
                        'context' => [],
                        'edit' => [

+                               'field' => [],

                                'route' => ['index' => 'index_url'],
                                'view' => [
                                        'name' => '@RapsysUser/form/register.html.twig',
                                'route' => ['index' => 'index_url'],
                                'view' => [
                                        'name' => '@RapsysUser/form/register.html.twig',


@@ -110,6 +111,7 @@ class Configuration implements ConfigurationInterface {
                                ]
                        ],
                        'register' => [
                                ]
                        ],
                        'register' => [

+                               'field' => [],

                                'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],
                                'view' => [
                                        'name' => '@RapsysUser/form/register.html.twig',
                                'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],
                                'view' => [
                                        'name' => '@RapsysUser/form/register.html.twig',


@@ -146,15 +148,9 @@ class Configuration implements ConfigurationInterface {
                                                ->scalarPrototype()->end()
                                        ->end()
                                        ->arrayNode('default')
                                                ->scalarPrototype()->end()
                                        ->end()
                                        ->arrayNode('default')

-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['default']['civility'])->end()
-                                                       ->arrayNode('group')
-                                                               ->treatNullLike([])
-                                                               ->defaultValue($defaults['default']['group'])
-                                                               ->scalarPrototype()->end()
-                                                       ->end()
-                                               ->end()
+                                               ->treatNullLike([])
+                                               ->defaultValue($defaults['default'])
+                                               ->variablePrototype()->end()

                                        ->end()
                                        ->arrayNode('route')
                                                ->addDefaultsIfNotSet()
                                        ->end()
                                        ->arrayNode('route')
                                                ->addDefaultsIfNotSet()


@@ -253,6 +249,11 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('edit')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('edit')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('field')
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['edit']['field'])
+                                                               ->variablePrototype()->end()
+                                                       ->end()

                                                        ->arrayNode('route')
                                                                ->treatNullLike([])
                                                                ->defaultValue($defaults['edit']['route'])
                                                        ->arrayNode('route')
                                                                ->treatNullLike([])
                                                                ->defaultValue($defaults['edit']['route'])


@@ -333,6 +334,11 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('register')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('register')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('field')
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['register']['field'])
+                                                               ->variablePrototype()->end()
+                                                       ->end()

                                                        ->arrayNode('route')
                                                                ->treatNullLike([])
                                                                ->defaultValue($defaults['register']['route'])
                                                        ->arrayNode('route')
                                                                ->treatNullLike([])
                                                                ->defaultValue($defaults['register']['route'])