X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/bab59a4b88a081a7a27a53b4559d74e63b68db92..832be89c5836f1f58e4e8ef89587ddcf1bd68c9c:/DependencyInjection/RapsysUserExtension.php

diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php
index 58c86a6..5f92c10 100644
--- a/DependencyInjection/RapsysUserExtension.php
+++ b/DependencyInjection/RapsysUserExtension.php
@@ -1,11 +1,20 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys UserBundle 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\UserBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+
+use Rapsys\UserBundle\RapsysUserBundle;
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -16,65 +25,38 @@ class RapsysUserExtension extends Extension {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function load(array $configs, ContainerBuilder $container) {
-		//Load configuration
-		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-		$loader->load('services.yml');
-
+	public function load(array $configs, ContainerBuilder $container): void {
 		//Load configuration
 		$configuration = $this->getConfiguration($configs, $container);
+
+		//Process the configuration to get merged config
 		$config = $this->processConfiguration($configuration, $configs);
 
-		//Set default config in parameter
-		if (!$container->hasParameter($alias = $this->getAlias())) {
-			$container->setParameter($alias, $config[$alias]);
-		} else {
-			$config[$alias] = $container->getParameter($alias);
-		}
+		//Set bundle alias
+		$alias = RapsysUserBundle::getAlias();
 
-		//Transform the two level tree in flat parameters
-		foreach($config[$alias] as $k => $v) {
-			foreach($v as $s => $d) {
-				//Set is as parameters
-				$container->setParameter($alias.'.'.$k.'.'.$s, $d);
-			}
+		//Detect when no user configuration is provided
+		if ($configs === [[]]) {
+			//Prepend default config
+			$container->prependExtensionConfig($alias, $config);
 		}
-	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAlias() {
-		return 'rapsys_user';
+		//Save configuration in parameters
+		$container->setParameter($alias, $config);
+
+		//Set rapsysuser.alias key
+		$container->setParameter($alias.'.alias', $alias);
+
+		//Set rapsysuser.version key
+		$container->setParameter($alias.'.version', RapsysUserBundle::getVersion());
 	}
 
 	/**
-	 * The function that parses the array to flatten it into a one level depth array
+	 * {@inheritdoc}
 	 *
-	 * @param $array	The config values array
-	 * @param $path		The current key path
-	 * @param $depth	The maxmium depth
-	 * @param $sep		The separator string
+	 * @xxx Required by kernel to load renamed alias configuration
 	 */
-	/*protected function flatten($array, $path, $depth = 10, $sep = '.') {
-		//Init res
-		$res = array();
-
-		//Pass through non hashed or empty array
-		if ($depth && is_array($array) && ($array === [] || array_keys($array) === range(0, count($array) - 1))) {
-			$res[$path] = $array;
-		//Flatten hashed array
-		} elseif ($depth && is_array($array)) {
-			foreach($array as $k => $v) {
-				$sub = $path ? $path.$sep.$k:$k;
-				$res += $this->flatten($v, $sub, $depth - 1, $sep);
-			}
-		//Pass scalar value directly
-		} else {
-			$res[$path] = $array;
-		}
-
-		//Return result
-		return $res;
-	}*/
+	public function getAlias(): string {
+		return RapsysUserBundle::getAlias();
+	}
 }