X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/c04459bb328d6719eeb9c48bdec7dde48e7166a8..b489b0c2c4aded2126374d350b2a3dcab5c9943b:/DependencyInjection/Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index c556d1e..13d24a7 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -5,111 +5,27 @@ 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.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
  */
 class Configuration implements ConfigurationInterface {
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getConfigTreeBuilder() {
-		$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.
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfigTreeBuilder() {
+        $treeBuilder = new TreeBuilder();
+
+        // 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',
-				'icon' => [
-					'ico' => '@RapsysAir/ico/icon.ico',
-					'svg' => '@RapsysAir/svg/icon.svg'
-				],
-				'logo' => [
-					'png' => '@RapsysAir/png/logo.png',
-					'svg' => '@RapsysAir/svg/logo.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
-				'png' => [
-					//Default
-					256 => '@RapsysAir/png/icon.256.png',
-
-					//For google
-					//Chrome for Android home screen icon
-					196 => '@RapsysAir/png/icon.196.png',
-					//Google Developer Web App Manifest Recommendation
-					192 => '@RapsysAir/png/icon.192.png',
-					//Chrome Web Store icon
-					128 => '@RapsysAir/png/icon.128.png',
-
-					//Fallback
-					32 => '@RapsysAir/png/icon.32.png',
-
-					//For apple
-					//XXX: old obsolete format: [57, 72, 76, 114, 120, 144]
-					//XXX: see https://webhint.io/docs/user-guide/hints/hint-apple-touch-icons/
-					//XXX: see https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html
-					//iPhone Retina
-					180 => '@RapsysAir/png/icon.180.png',
-					//iPad Retina touch icon
-					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)
-					310 => '@RapsysAir/png/icon.310.png',
-					150 => '@RapsysAir/png/icon.150.png',
-					70 => '@RapsysAir/png/icon.70.png'
-				],
-				'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'
-			],
-			'contact' => [
-				'title' => 'Libre Air',
-				'mail' => 'contact@airlibre.eu'
-			],
-			'facebook' => [
-				'apps' => [3728770287223690],
-				'height' => 630,
-				'width' => 1200
-			],
-			'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/<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)
-			#]
+			'logo' => 'bundles/rapsysair/png/logo.png',
+			'title' => 'Open Air',
+			'contact_name' => 'Raphaël Gertz',
+			'contact_mail' => 'airlibre@rapsys.eu',
 		];
 
 		//Here we define the parameters that are allowed to configure the bundle.
@@ -120,100 +36,21 @@ class Configuration implements ConfigurationInterface {
 		//Here we define the parameters that are allowed to configure the bundle.
 		$treeBuilder
 			//Parameters
-			->getRootNode()
+			->root('parameters')
 				->addDefaultsIfNotSet()
 				->children()
-					->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()
-							->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('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')
+					->arrayNode('rapsys_air')
 						->addDefaultsIfNotSet()
 						->children()
-							->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['contact']['title'])->end()
-							->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
+							->scalarNode('logo')->defaultValue($defaults['logo'])->treatNullLike($defaults['logo'])->isRequired()->end()
+							->scalarNode('title')->defaultValue($defaults['title'])->treatNullLike($defaults['title'])->isRequired()->end()
+							->scalarNode('contact_name')->defaultValue($defaults['contact_name'])->treatNullLike($defaults['contact_name'])->isRequired()->end()
+							->scalarNode('contact_mail')->defaultValue($defaults['contact_mail'])->treatNullLike($defaults['contact_mail'])->isRequired()->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()
 				->end()
 			->end();
 
-		return $treeBuilder;
-	}
+        return $treeBuilder;
+    }
 }