Add note about locale requirement with underscore and not dash

[airbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index c556d1e456400d5dd1461d18d1f3a6951f705def..cab508582bfb1541fefd3b6db21fafd9c7402f36 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -5,8 +5,6 @@ namespace Rapsys\AirBundle\DependencyInjection;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 

-use Rapsys\AirBundle\RapsysAirBundle;
-

 /**
  * This is the class that validates and merges configuration from your app/config files.
  *
 /**
  * This is the class that validates and merges configuration from your app/config files.
  *


@@ -17,7 +15,7 @@ class Configuration implements ConfigurationInterface {
         * {@inheritdoc}
         */
        public function getConfigTreeBuilder() {
         * {@inheritdoc}
         */
        public function getConfigTreeBuilder() {

-               $treeBuilder = new TreeBuilder($alias = RapsysAirBundle::getAlias());
+               $treeBuilder = new TreeBuilder('rapsys_air');

 
                // Here you should define the parameters that are allowed to
                // configure your bundle. See the documentation linked above for
 
                // Here you should define the parameters that are allowed to
                // configure your bundle. See the documentation linked above for


@@ -26,14 +24,8 @@ class Configuration implements ConfigurationInterface {
                $defaults = [
                        'site' => [
                                'donate' => 'https://paypal.me/milongaraphael',
                $defaults = [
                        'site' => [
                                'donate' => 'https://paypal.me/milongaraphael',

-                               'icon' => [
-                                       'ico' => '@RapsysAir/ico/icon.ico',
-                                       'svg' => '@RapsysAir/svg/icon.svg'
-                               ],
-                               'logo' => [
-                                       'png' => '@RapsysAir/png/logo.png',
-                                       'svg' => '@RapsysAir/svg/logo.svg'
-                               ],
+                               'ico' => '@RapsysAir/ico/icon.ico',
+                               'logo' => '@RapsysAir/png/logo.png',

                                //The png icon array
                                //XXX: see https://www.emergeinteractive.com/insights/detail/the-essentials-of-favicons/
                                //XXX: see https://caniuse.com/#feat=link-icon-svg
                                //The png icon array
                                //XXX: see https://www.emergeinteractive.com/insights/detail/the-essentials-of-favicons/
                                //XXX: see https://caniuse.com/#feat=link-icon-svg


@@ -71,9 +63,14 @@ class Configuration implements ConfigurationInterface {
                                        150 => '@RapsysAir/png/icon.150.png',
                                        70 => '@RapsysAir/png/icon.70.png'
                                ],
                                        150 => '@RapsysAir/png/icon.150.png',
                                        70 => '@RapsysAir/png/icon.70.png'
                                ],

+                               'svg' => '@RapsysAir/svg/icon.svg',

                                'title' => 'Libre Air',
                                'url' => 'rapsys_air'
                        ],
                                'title' => 'Libre Air',
                                'url' => 'rapsys_air'
                        ],

+                       'cache' => [
+                               'namespace' => 'airlibre',
+                               'lifetime' => 0
+                       ],

                        'calendar' => [
                                'calendar' => '%env(string:RAPSYSAIR_CALENDAR)',
                                'prefix' => '%env(string:RAPSYSAIR_PREFIX)',
                        'calendar' => [
                                'calendar' => '%env(string:RAPSYSAIR_CALENDAR)',
                                'prefix' => '%env(string:RAPSYSAIR_PREFIX)',


@@ -103,13 +100,10 @@ class Configuration implements ConfigurationInterface {
                        //XXX: see https://symfony.com/doc/current/components/config/definition.html#normalization
                        //XXX: see https://github.com/symfony/symfony/issues/7405
                        'languages' => '%rapsys_user.languages%',
                        //XXX: see https://symfony.com/doc/current/components/config/definition.html#normalization
                        //XXX: see https://github.com/symfony/symfony/issues/7405
                        'languages' => '%rapsys_user.languages%',

-                       'path' => is_link(($prefix = is_dir('public') ? './public/' : './').($link = 'bundles/'.str_replace('_', '', $alias))) && is_dir(realpath($prefix.$link)) || is_dir($prefix.$link) ? $link : dirname(__DIR__).'/Resources/public'
-                       #'public' => [
-                       #       //XXX: get path with bundles/<alias> or full path if not installed
-                       #       //XXX: current working directory may be project dir or public subdir depending on context
-                       #       'path' => is_link(($prefix = is_dir('public') ? './public/' : './').($link = 'bundles/'.str_replace('_', '', $alias))) && is_dir(realpath($prefix.$link)) || is_dir($prefix.$link) ? $link : dirname(__DIR__).'/Resources/public',
-                       #       'url' => '/bundles/'.str_replace('_', '', $alias)
-                       #]
+                       'path' => [
+                               'cache' => '%kernel.project_dir%/var/cache',
+                               'public' => dirname(__DIR__).'/Resources/public'
+                       ]

                ];
 
                //Here we define the parameters that are allowed to configure the bundle.
                ];
 
                //Here we define the parameters that are allowed to configure the bundle.


@@ -127,28 +121,25 @@ class Configuration implements ConfigurationInterface {
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->scalarNode('donate')->cannotBeEmpty()->defaultValue($defaults['site']['donate'])->end()
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->scalarNode('donate')->cannotBeEmpty()->defaultValue($defaults['site']['donate'])->end()

-                                                       ->arrayNode('icon')
-                                                               ->treatNullLike([])
-                                                               ->defaultValue($defaults['site']['icon'])
-                                                               ->scalarPrototype()->end()
-                                                       ->end()
-                                                       ->arrayNode('logo')
-                                                               ->treatNullLike([])
-                                                               ->defaultValue($defaults['site']['logo'])
-                                                               ->scalarPrototype()->end()
-                                                       ->end()
+                                                       ->scalarNode('ico')->cannotBeEmpty()->defaultValue($defaults['site']['ico'])->end()
+                                                       ->scalarNode('logo')->cannotBeEmpty()->defaultValue($defaults['site']['logo'])->end()

                                                        ->arrayNode('png')
                                                                ->treatNullLike([])
                                                                ->defaultValue($defaults['site']['png'])
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->arrayNode('png')
                                                                ->treatNullLike([])
                                                                ->defaultValue($defaults['site']['png'])
                                                                ->scalarPrototype()->end()
                                                        ->end()

-                                                       /*->scalarNode('ico')->cannotBeEmpty()->defaultValue($defaults['site']['ico'])->end()
-                                                       ->scalarNode('logo')->cannotBeEmpty()->defaultValue($defaults['site']['logo'])->end()
-                                                       ->scalarNode('svg')->cannotBeEmpty()->defaultValue($defaults['site']['svg'])->end()*/
+                                                       ->scalarNode('svg')->cannotBeEmpty()->defaultValue($defaults['site']['svg'])->end()

                                                        ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['site']['title'])->end()
                                                        ->scalarNode('url')->cannotBeEmpty()->defaultValue($defaults['site']['url'])->end()
                                                ->end()
                                        ->end()
                                                        ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['site']['title'])->end()
                                                        ->scalarNode('url')->cannotBeEmpty()->defaultValue($defaults['site']['url'])->end()
                                                ->end()
                                        ->end()

+                                       ->arrayNode('cache')
+                                               ->addDefaultsIfNotSet()
+                                               ->children()
+                                                       ->scalarNode('namespace')->defaultValue($defaults['cache']['namespace'])->end()
+                                                       ->integerNode('lifetime')->min(0)->defaultValue($defaults['cache']['lifetime'])->end()
+                                               ->end()
+                                       ->end()

                                        ->arrayNode('calendar')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('calendar')
                                                ->addDefaultsIfNotSet()
                                                ->children()


@@ -189,28 +180,15 @@ class Configuration implements ConfigurationInterface {
                                                ->end()
                                        ->end()
                                        ->scalarNode('locale')->cannotBeEmpty()->defaultValue($defaults['locale'])->end()
                                                ->end()
                                        ->end()
                                        ->scalarNode('locale')->cannotBeEmpty()->defaultValue($defaults['locale'])->end()

-                                       #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
-                                       #->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
-                                       ->variableNode('locales')
-                                               ->treatNullLike([])
-                                               ->defaultValue($defaults['locales'])
-                                               #->scalarPrototype()->end()
-                                       ->end()
-                                       #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
-                                       #->scalarNode('languages')->cannotBeEmpty()->defaultValue($defaults['languages'])->end()
-                                       ->variableNode('languages')
-                                               ->treatNullLike([])
-                                               ->defaultValue($defaults['languages'])
-                                               #->scalarPrototype()->end()
+                                       ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
+                                       ->scalarNode('languages')->cannotBeEmpty()->defaultValue($defaults['languages'])->end()
+                                       ->arrayNode('path')
+                                               ->addDefaultsIfNotSet()
+                                               ->children()
+                                                       ->scalarNode('cache')->defaultValue($defaults['path']['cache'])->end()
+                                                       ->scalarNode('public')->defaultValue($defaults['path']['public'])->end()
+                                               ->end()

                                        ->end()
                                        ->end()

-                                       ->scalarNode('path')->defaultValue($defaults['path'])->end()
-                                       #->arrayNode('public')
-                                       #       ->addDefaultsIfNotSet()
-                                       #       ->children()
-                                       #               ->scalarNode('path')->defaultValue($defaults['public']['path'])->end()
-                                       #               ->scalarNode('url')->defaultValue($defaults['public']['url'])->end()
-                                       #       ->end()
-                                       #->end()

                                ->end()
                        ->end();
 
                                ->end()
                        ->end();