X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/46718ab1a0cb7878556d18db4dffa306e95110cd..1aa803557744dc452cd804fe8d0ae55771b4ce39:/DependencyInjection/Configuration.php?ds=inline diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 01d6ee5..41c6df8 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -1,7 +1,7 @@ * @@ -11,17 +11,17 @@ namespace Rapsys\UserBundle\DependencyInjection; +use Rapsys\UserBundle\RapsysUserBundle; + use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; -use Rapsys\UserBundle\RapsysUserBundle; - /** + * {@inheritdoc} + * * This is the class that validates and merges configuration from your app/config files. * * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html - * - * {@inheritdoc} */ class Configuration implements ConfigurationInterface { /** @@ -34,72 +34,87 @@ class Configuration implements ConfigurationInterface { //The bundle default values $defaults = [ 'class' => [ - 'group' => 'Rapsys\\UserBundle\\Entity\\Group', 'civility' => 'Rapsys\\UserBundle\\Entity\\Civility', + 'group' => 'Rapsys\\UserBundle\\Entity\\Group', 'user' => 'Rapsys\\UserBundle\\Entity\\User' ], 'default' => [ + 'admin' => 'ROLE_ADMIN', 'civility' => 'Mister', - 'group' => [ 'User' ] + 'languages' => [ + 'en_gb' => 'English' + ], + 'locales' => [ 'en_gb' ], + 'group' => [ 'Guest' ] ], 'route' => [ + 'home' => [ + 'name' => 'rapsysuser', + 'context' => [] + ], 'confirm' => [ - 'name' => 'rapsys_user_confirm', + 'name' => 'rapsysuser_confirm', 'context' => [] ], 'edit' => [ - 'name' => 'rapsys_user_edit', + 'name' => 'rapsysuser_edit', 'context' => [] ], 'index' => [ - 'name' => 'rapsys_user_index', + 'name' => 'rapsysuser_index', 'context' => [] ], 'login' => [ - 'name' => 'rapsys_user_login', + 'name' => 'rapsysuser_login', 'context' => [] ], 'recover' => [ - 'name' => 'rapsys_user_recover', + 'name' => 'rapsysuser_recover', 'context' => [] ], 'register' => [ - 'name' => 'rapsys_user_register', + 'name' => 'rapsysuser_register', 'context' => [] ] ], - 'translate' => [], - 'locales' => '%kernel.translator.fallbacks%', - 'languages' => [ - 'en_gb' => 'English' - ], + 'translate' => [ 'title' ], 'contact' => [ - 'title' => 'John Doe', - 'mail' => 'contact@example.com' + 'address' => 'contact@example.com', + 'name' => 'John Doe' ], 'context' => [], 'edit' => [ - 'route' => ['index' => 'index_url'], + 'admin' => [ 'mail' => true ], + 'field' => [], + 'route' => [ 'home' => 'home_url' ], 'view' => [ - 'form' => 'Rapsys\UserBundle\Form\RegisterType', - 'name' => '@RapsysUser/form/register.html.twig', - 'context' => [] + 'name' => '@RapsysUser/register.html.twig', + 'edit' => 'Rapsys\UserBundle\Form\EditType', + 'reset' => 'Rapsys\UserBundle\Form\ResetType', + 'context' => [ 'title' => 'Edit' ] + ] + ], + 'index' => [ + 'route' => [ 'home' => 'home_url' ], + 'view' => [ + 'name' => '@RapsysUser/index.html.twig', + 'context' => [ 'title' => 'Index' ] ] ], 'login' => [ - 'route' => ['index' => 'index_url'], + 'route' => [ 'home' => 'home_url', 'recover' => 'recover_url' ], 'view' => [ - 'name' => '@RapsysUser/form/login.html.twig', + 'name' => '@RapsysUser/login.html.twig', 'form' => 'Rapsys\UserBundle\Form\LoginType', - 'context' => [] + 'context' => [ 'title' => 'Login' ] ] ], 'recover' => [ - 'route' => ['index' => 'index_url', 'recover' => 'recover_url'], + 'route' => [ 'home' => 'home_url', 'recover' => 'recover_url' ], 'view' => [ - 'name' => '@RapsysUser/form/recover.html.twig', - 'form' => 'Rapsys\UserBundle\Form\LoginType', - 'context' => [] + 'name' => '@RapsysUser/recover.html.twig', + 'form' => 'Rapsys\UserBundle\Form\RecoverType', + 'context' => [ 'title' => 'Recover' ] ], 'mail' => [ 'subject' => 'Welcome back!', @@ -109,11 +124,13 @@ class Configuration implements ConfigurationInterface { ] ], 'register' => [ - 'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'], + 'admin' => [], + 'field' => [], + 'route' => [ 'home' => 'home_url', 'confirm' => 'confirm_url' ], 'view' => [ + 'name' => '@RapsysUser/register.html.twig', 'form' => 'Rapsys\UserBundle\Form\RegisterType', - 'name' => '@RapsysUser/form/register.html.twig', - 'context' => [] + 'context' => [ 'title' => 'Register' ] ], 'mail' => [ 'subject' => 'Welcome!', @@ -131,8 +148,8 @@ class Configuration implements ConfigurationInterface { * @link http://symfony.com/doc/current/components/config/definition.html * @link https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63 * - * @see php bin/console config:dump-reference rapsys_user to dump default config - * @see php bin/console debug:config rapsys_user to dump config + * @see php bin/console config:dump-reference rapsysuser to dump default config + * @see php bin/console debug:config rapsysuser to dump config */ $treeBuilder //Parameters @@ -140,14 +157,34 @@ class Configuration implements ConfigurationInterface { ->addDefaultsIfNotSet() ->children() ->arrayNode('class') - ->treatNullLike([]) - ->defaultValue($defaults['class']) - ->scalarPrototype()->end() + ->addDefaultsIfNotSet() + #XXX: ignoreExtraKeys(bool $remove = true) + ->ignoreExtraKeys(false) + ->children() + ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end() + ->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end() + ->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end() + ->end() ->end() ->arrayNode('default') ->addDefaultsIfNotSet() + #XXX: ignoreExtraKeys(bool $remove = true) + ->ignoreExtraKeys(false) ->children() + ->scalarNode('admin')->cannotBeEmpty()->defaultValue($defaults['default']['admin'])->end() ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['default']['civility'])->end() + #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false) + ->arrayNode('languages') + ->treatNullLike([]) + ->defaultValue($defaults['default']['languages']) + ->scalarPrototype()->end() + ->end() + #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false) + ->arrayNode('locales') + ->treatNullLike([]) + ->defaultValue($defaults['default']['locales']) + ->scalarPrototype()->end() + ->end() ->arrayNode('group') ->treatNullLike([]) ->defaultValue($defaults['default']['group']) @@ -169,24 +206,35 @@ class Configuration implements ConfigurationInterface { ->end() ->end() ->end() - ->arrayNode('index') + ->arrayNode('edit') ->addDefaultsIfNotSet() ->children() - ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['index']['name'])->end() + ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['edit']['name'])->end() ->arrayNode('context') ->treatNullLike([]) - ->defaultValue($defaults['route']['index']['context']) + ->defaultValue($defaults['route']['edit']['context']) ->scalarPrototype()->end() ->end() ->end() ->end() - ->arrayNode('edit') + ->arrayNode('home') ->addDefaultsIfNotSet() ->children() - ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['edit']['name'])->end() + ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['home']['name'])->end() ->arrayNode('context') ->treatNullLike([]) - ->defaultValue($defaults['route']['edit']['context']) + ->defaultValue($defaults['route']['home']['context']) + ->scalarPrototype()->end() + ->end() + ->end() + ->end() + ->arrayNode('index') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['index']['name'])->end() + ->arrayNode('context') + ->treatNullLike([]) + ->defaultValue($defaults['route']['index']['context']) ->scalarPrototype()->end() ->end() ->end() @@ -231,17 +279,11 @@ class Configuration implements ConfigurationInterface { ->defaultValue($defaults['translate']) ->scalarPrototype()->end() ->end() - ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end() - ->arrayNode('languages') - ->treatNullLike([]) - ->defaultValue($defaults['languages']) - ->scalarPrototype()->end() - ->end() ->arrayNode('contact') ->addDefaultsIfNotSet() ->children() - ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['contact']['title'])->end() - ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end() + ->scalarNode('address')->cannotBeEmpty()->defaultValue($defaults['contact']['address'])->end() + ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end() ->end() ->end() ->arrayNode('context') @@ -252,6 +294,16 @@ class Configuration implements ConfigurationInterface { ->arrayNode('edit') ->addDefaultsIfNotSet() ->children() + ->arrayNode('admin') + ->treatNullLike([]) + ->defaultValue($defaults['edit']['admin']) + ->variablePrototype()->end() + ->end() + ->arrayNode('field') + ->treatNullLike([]) + ->defaultValue($defaults['edit']['field']) + ->variablePrototype()->end() + ->end() ->arrayNode('route') ->treatNullLike([]) ->defaultValue($defaults['edit']['route']) @@ -260,7 +312,8 @@ class Configuration implements ConfigurationInterface { ->arrayNode('view') ->addDefaultsIfNotSet() ->children() - ->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['form'])->end() + ->scalarNode('edit')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['edit'])->end() + ->scalarNode('reset')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['reset'])->end() ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['name'])->end() ->arrayNode('context') ->treatNullLike([]) @@ -271,6 +324,27 @@ class Configuration implements ConfigurationInterface { ->end() ->end() ->end() + ->arrayNode('index') + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('route') + ->treatNullLike([]) + ->defaultValue($defaults['index']['route']) + ->scalarPrototype()->end() + ->end() + ->arrayNode('view') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['index']['view']['name'])->end() + ->arrayNode('context') + ->treatNullLike([]) + ->defaultValue($defaults['index']['view']['context']) + ->variablePrototype()->end() + ->end() + ->end() + ->end() + ->end() + ->end() ->arrayNode('login') ->addDefaultsIfNotSet() ->children() @@ -331,6 +405,16 @@ class Configuration implements ConfigurationInterface { ->arrayNode('register') ->addDefaultsIfNotSet() ->children() + ->arrayNode('admin') + ->treatNullLike([]) + ->defaultValue($defaults['edit']['admin']) + ->variablePrototype()->end() + ->end() + ->arrayNode('field') + ->treatNullLike([]) + ->defaultValue($defaults['register']['field']) + ->variablePrototype()->end() + ->end() ->arrayNode('route') ->treatNullLike([]) ->defaultValue($defaults['register']['route'])