X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/3fc7041641c843e06b9e05704bf888fba035690e..5fbd84cf71e2ca78e246ad14c65f7c11037f3667:/DependencyInjection/Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index e2eb62d..d7f0adb 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -5,6 +5,8 @@ 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.
  *
@@ -15,7 +17,7 @@ class Configuration implements ConfigurationInterface {
 	 * {@inheritdoc}
 	 */
 	public function getConfigTreeBuilder() {
-		$treeBuilder = new TreeBuilder('rapsys_air');
+		$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
@@ -23,8 +25,15 @@ class Configuration implements ConfigurationInterface {
 		//Set defaults
 		$defaults = [
 			'site' => [
-				'ico' => '@RapsysAir/ico/icon.ico',
-				'logo' => '@RapsysAir/png/logo.png',
+				'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
@@ -62,21 +71,43 @@ 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'
 			],
+			'google' => [
+				'client' => '%env(string:GOOGLE_CLIENT)',
+				'project' => '%env(string:GOOGLE_PROJECT)',
+				'secret' => '%env(string:GOOGLE_SECRET)'
+			],
 			'copy' => [
+				'by' => 'Rapsys',
+				'link' => 'https://rapsys.eu',
 				'long' => 'All rights reserved',
-				'short' => 'Copyright 2019'
+				'short' => 'Copyright 2019-2021',
+				'title' => 'Rapsys'
 			],
 			'contact' => [
-				'name' => 'John Doe',
-				'mail' => 'contact@example.com'
+				'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)
+			#]
 		];
 
 		//Here we define the parameters that are allowed to configure the bundle.
@@ -93,35 +124,89 @@ class Configuration implements ConfigurationInterface {
 					->arrayNode('site')
 						->addDefaultsIfNotSet()
 						->children()
-							->scalarNode('ico')->cannotBeEmpty()->defaultValue($defaults['site']['ico'])->end()
-							->scalarNode('logo')->cannotBeEmpty()->defaultValue($defaults['site']['logo'])->end()
+							->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('svg')->cannotBeEmpty()->defaultValue($defaults['site']['svg'])->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('google')
+						->addDefaultsIfNotSet()
+						->children()
+							->scalarNode('client')->defaultValue($defaults['google']['client'])->end()
+							->scalarNode('project')->defaultValue($defaults['google']['project'])->end()
+							->scalarNode('secret')->defaultValue($defaults['google']['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('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end()
+							->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['contact']['title'])->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()
-					->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
-					->scalarNode('languages')->cannotBeEmpty()->defaultValue($defaults['languages'])->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();