Use checker member for isGranted call

[airbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 131ca1b5884a8b4c81b0efb592f286be58009f43..1ed665b9ba12a3e13bc32ef89850f64a7907b078 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,10 +1,21 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys AirBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */

 
 namespace Rapsys\AirBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 
 namespace Rapsys\AirBundle\DependencyInjection;
 
 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.
  *


@@ -14,18 +25,33 @@ class Configuration implements ConfigurationInterface {
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

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

 
                // Here you should define the parameters that are allowed to
                // configure your bundle. See the documentation linked above for
                // more information on that topic.
                //Set defaults
                $defaults = [
 
                // Here you should define the parameters that are allowed to
                // configure your bundle. See the documentation linked above for
                // more information on that topic.
                //Set defaults
                $defaults = [

-                       'site' => [
-                               'donate' => 'https://paypal.me/milongaraphael',
+                       'contact' => [
+                               'address' => 'contact@airlibre.eu',
+                               'name' => 'Libre Air'
+                       ],
+                       'copy' => [
+                               'by' => 'Rapsys',
+                               'link' => 'https://rapsys.eu',
+                               'long' => 'All rights reserved',
+                               'short' => 'Copyright 2019-2021',
+                               'title' => 'Rapsys'
+                       ],
+                       'donate' => 'https://paypal.me/milongaraphael',
+                       'facebook' => [
+                               'apps' => [3728770287223690],
+                               'height' => 630,
+                               'width' => 1200
+                       ],
+                       'icon' => [

                                'ico' => '@RapsysAir/ico/icon.ico',
                                '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


@@ -63,44 +89,27 @@ 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'
-                       ],
-                       'cache' => [
-                               'namespace' => 'airlibre',
-                               'lifetime' => 0
-                       ],
-                       'calendar' => [
-                               'calendar' => '%env(string:RAPSYSAIR_CALENDAR)',
-                               'prefix' => '%env(string:RAPSYSAIR_PREFIX)',
-                               'project' => '%env(string:RAPSYSAIR_PROJECT)',
-                               'client' => '%env(string:GOOGLE_CLIENT_ID)',
-                               'secret' => '%env(string:GOOGLE_CLIENT_SECRET)'
-                       ],
-                       'copy' => [
-                               'by' => 'Rapsys',
-                               'link' => 'https://rapsys.eu',
-                               'long' => 'All rights reserved',
-                               'short' => 'Copyright 2019-2021',
-                               'title' => 'Rapsys'
+                               'svg' => '@RapsysAir/svg/icon.svg'

                        ],
                        ],

-                       'contact' => [
-                               'title' => 'Libre Air',
-                               'mail' => 'contact@airlibre.eu'
+                       //XXX: revert to underscore because of that shit:
+                       //XXX: see https://symfony.com/doc/current/components/config/definition.html#normalization
+                       //XXX: see https://github.com/symfony/symfony/issues/7405
+                       //TODO: copy to '%rapsys_user.languages%',
+                       'languages' => [
+                               'en_gb' => 'English'

                        ],
                        ],

-                       'facebook' => [
-                               'apps' => [3728770287223690],
-                               'height' => 630,
-                               'width' => 1200
+                       //TODO: copy to '%kernel.default_locale%'
+                       'locale' => 'en_gb',
+                       //TODO: copy to '%kernel.translator.fallbacks%'
+                       'locales' => [ 'en_gb' ],
+                       'logo' => [
+                               'alt' => 'Libre Air\'s booking system logo',
+                               'png' => '@RapsysAir/png/logo.png',
+                               'svg' => '@RapsysAir/svg/logo.svg'

                        ],
                        ],

-                       'locale' => '%kernel.default_locale%',
-                       'locales' => '%kernel.translator.fallbacks%',
-                       'languages' => '%rapsys_user.languages%',
-                       'path' => [
-                               'cache' => '%kernel.project_dir%/var/cache',
-                               'public' => dirname(__DIR__).'/Resources/public'
-                       ]
+                       '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',
+                       'root' => 'rapsys_air',
+            'title' => 'Libre Air\'s booking system'

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


@@ -114,37 +123,11 @@ class Configuration implements ConfigurationInterface {
                        ->getRootNode()
                                ->addDefaultsIfNotSet()
                                ->children()
                        ->getRootNode()
                                ->addDefaultsIfNotSet()
                                ->children()

-                                       ->arrayNode('site')
-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('donate')->cannotBeEmpty()->defaultValue($defaults['site']['donate'])->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()
-                                                       ->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()
-                                       ->arrayNode('cache')
-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('namespace')->defaultValue($defaults['cache']['namespace'])->end()
-                                                       ->integerNode('lifetime')->min(0)->defaultValue($defaults['cache']['lifetime'])->end()
-                                               ->end()
-                                       ->end()
-                                       ->arrayNode('calendar')
+                                       ->arrayNode('contact')

                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                ->addDefaultsIfNotSet()
                                                ->children()

-                                                       ->scalarNode('calendar')->defaultValue($defaults['calendar']['calendar'])->end()
-                                                       ->scalarNode('prefix')->defaultValue($defaults['calendar']['prefix'])->end()
-                                                       ->scalarNode('project')->defaultValue($defaults['calendar']['project'])->end()
-                                                       ->scalarNode('client')->defaultValue($defaults['calendar']['client'])->end()
-                                                       ->scalarNode('secret')->defaultValue($defaults['calendar']['secret'])->end()
+                                                       ->scalarNode('address')->cannotBeEmpty()->defaultValue($defaults['contact']['address'])->end()
+                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end()

                                                ->end()
                                        ->end()
                                        ->arrayNode('copy')
                                                ->end()
                                        ->end()
                                        ->arrayNode('copy')


@@ -157,13 +140,7 @@ class Configuration implements ConfigurationInterface {
                                                        ->scalarNode('title')->defaultValue($defaults['copy']['title'])->end()
                                                ->end()
                                        ->end()
                                                        ->scalarNode('title')->defaultValue($defaults['copy']['title'])->end()
                                                ->end()
                                        ->end()

-                                       ->arrayNode('contact')
-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['contact']['title'])->end()
-                                                       ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
-                                               ->end()
-                                       ->end()
+                                       ->scalarNode('donate')->cannotBeEmpty()->defaultValue($defaults['donate'])->end()

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


@@ -176,16 +153,40 @@ class Configuration implements ConfigurationInterface {
                                                        ->integerNode('width')->min(0)->defaultValue($defaults['facebook']['width'])->end()
                                                ->end()
                                        ->end()
                                                        ->integerNode('width')->min(0)->defaultValue($defaults['facebook']['width'])->end()
                                                ->end()
                                        ->end()

+                                       ->arrayNode('icon')
+                                               ->addDefaultsIfNotSet()
+                                               ->children()
+                                                       ->scalarNode('ico')->defaultValue($defaults['icon']['ico'])->end()
+                                                       ->scalarNode('png')->defaultValue($defaults['icon']['png'])->end()
+                                                       ->scalarNode('svg')->defaultValue($defaults['icon']['svg'])->end()
+                                               ->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()
+                                       ->end()

                                        ->scalarNode('locale')->cannotBeEmpty()->defaultValue($defaults['locale'])->end()
                                        ->scalarNode('locale')->cannotBeEmpty()->defaultValue($defaults['locale'])->end()

-                                       ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
-                                       ->scalarNode('languages')->cannotBeEmpty()->defaultValue($defaults['languages'])->end()
-                                       ->arrayNode('path')
+                                       #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()
+                                       ->arrayNode('logo')

                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                ->addDefaultsIfNotSet()
                                                ->children()

-                                                       ->scalarNode('cache')->defaultValue($defaults['path']['cache'])->end()
-                                                       ->scalarNode('public')->defaultValue($defaults['path']['public'])->end()
+                                                       ->scalarNode('alt')->defaultValue($defaults['logo']['alt'])->end()
+                                                       ->scalarNode('png')->defaultValue($defaults['logo']['png'])->end()
+                                                       ->scalarNode('svg')->defaultValue($defaults['logo']['svg'])->end()

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

+                                       ->scalarNode('path')->defaultValue($defaults['path'])->end()
+                                       ->scalarNode('root')->cannotBeEmpty()->defaultValue($defaults['root'])->end()
+                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['title'])->end()

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