X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/c04459bb328d6719eeb9c48bdec7dde48e7166a8..13151a7908e0476d082d9d4dfd8038873b6fa7f7:/DependencyInjection/Configuration.php diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index c556d1e..8434833 100644 --- 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 Rapsys\AirBundle\RapsysAirBundle; - /** * 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() { - $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 @@ -25,15 +23,8 @@ class Configuration implements ConfigurationInterface { //Set defaults $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 @@ -62,8 +53,6 @@ class Configuration implements ConfigurationInterface { 167 => '@RapsysAir/png/icon.167.png', //iPad touch icon 152 => '@RapsysAir/png/icon.152.png', - //iOS7 - 120 => '@RapsysAir/png/icon.120.png', //For windows //XXX: see https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/dn255024(v=vs.85) @@ -71,45 +60,21 @@ class Configuration implements ConfigurationInterface { 150 => '@RapsysAir/png/icon.150.png', 70 => '@RapsysAir/png/icon.70.png' ], + 'svg' => '@RapsysAir/svg/icon.svg', 'title' => 'Libre Air', 'url' => 'rapsys_air' ], - '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' + 'short' => 'Copyright 2019' ], 'contact' => [ - 'title' => 'Libre Air', - 'mail' => 'contact@airlibre.eu' - ], - 'facebook' => [ - 'apps' => [3728770287223690], - 'height' => 630, - 'width' => 1200 + 'name' => 'John Doe', + 'mail' => 'contact@example.com' ], 'locale' => '%kernel.default_locale%', 'locales' => '%kernel.translator.fallbacks%', - //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 '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/ 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) - #] ]; //Here we define the parameters that are allowed to configure the bundle. @@ -126,91 +91,35 @@ class Configuration implements ConfigurationInterface { ->arrayNode('site') ->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() - /*->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() - ->arrayNode('calendar') - ->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() - ->end() - ->end() ->arrayNode('copy') ->addDefaultsIfNotSet() ->children() - ->scalarNode('by')->defaultValue($defaults['copy']['by'])->end() - ->scalarNode('link')->defaultValue($defaults['copy']['link'])->end() ->scalarNode('long')->defaultValue($defaults['copy']['long'])->end() ->scalarNode('short')->defaultValue($defaults['copy']['short'])->end() - ->scalarNode('title')->defaultValue($defaults['copy']['title'])->end() ->end() ->end() ->arrayNode('contact') ->addDefaultsIfNotSet() ->children() - ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['contact']['title'])->end() + ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end() ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end() ->end() ->end() - ->arrayNode('facebook') - ->addDefaultsIfNotSet() - ->children() - ->arrayNode('apps') - ->treatNullLike([]) - ->defaultValue($defaults['facebook']['apps']) - ->scalarPrototype()->end() - ->end() - ->integerNode('height')->min(0)->defaultValue($defaults['facebook']['height'])->end() - ->integerNode('width')->min(0)->defaultValue($defaults['facebook']['width'])->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() - ->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() + ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end() + ->scalarNode('languages')->cannotBeEmpty()->defaultValue($defaults['languages'])->end() ->end() ->end();