X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/50d3555b61847819e6ce9ae929bff31be071c5c8..42c78e9ec8855bddd6b835767f937d1eb53bd3bd:/DependencyInjection/RapsysAirExtension.php?ds=inline

diff --git a/DependencyInjection/RapsysAirExtension.php b/DependencyInjection/RapsysAirExtension.php
index ba082de..a66e3cc 100644
--- a/DependencyInjection/RapsysAirExtension.php
+++ b/DependencyInjection/RapsysAirExtension.php
@@ -1,4 +1,13 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys PackBundle 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;
 
@@ -7,6 +16,8 @@ use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 
+use Rapsys\AirBundle\RapsysAirBundle;
+
 /**
  * This is the class that loads and manages your bundle configuration.
  *
@@ -36,6 +47,25 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
 		//Set translator fallbacks
 		$container->setParameter('kernel.translator.fallbacks', $framework['translator']['fallbacks']);
 
+		//Set default locale
+		$container->setParameter('kernel.default_locale', $framework['default_locale']);
+
+		//Load rapsys_user configurations
+		//XXX: required to extract default_locale and translation.fallbacks
+		$rapsys_users = $container->getExtensionConfig('rapsys_user');
+
+		//Recursively merge rapsys_user configurations
+		$rapsys_user = array_reduce(
+			$rapsys_users,
+			function ($res, $i) {
+				return array_merge_recursive($res, $i);
+			},
+			[]
+		);
+
+		//Set rapsys_user.languages key
+		$container->setParameter('rapsys_user.languages', $rapsys_user['languages']);
+
 		//Process the configuration
 		$configs = $container->getExtensionConfig($this->getAlias());
 
@@ -56,7 +86,7 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
 
 		//Store flattened array in parameters
 		//XXX: don't flatten rapsys_air.site.png key which is required to be an array
-		foreach($this->flatten($config, $this->getAlias(), 10, '.', ['rapsys_air.site.png', 'rapsys_air.locales']) as $k => $v) {
+		foreach($this->flatten($config, $this->getAlias(), 10, '.', ['rapsys_air.site.png', 'rapsys_air.site.icon', 'rapsys_air.site.logo', 'rapsys_air.facebook.apps', 'rapsys_air.locales', 'rapsys_air.languages']) as $k => $v) {
 			$container->setParameter($k, $v);
 		}
 	}
@@ -70,8 +100,8 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getAlias() {
-		return 'rapsys_air';
+	public function getAlias(): string {
+		return RapsysAirBundle::getAlias();
 	}
 
 	/**