Cleanup

[userbundle] / DependencyInjection / RapsysUserExtension.php

diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php
index 6dd55c74a60c73f0728f2a688c21b8096ec7dc0b..d69ee4df0405b10f6d50fb3e04a7e7343a77cd57 100644 (file)
--- a/DependencyInjection/RapsysUserExtension.php
+++ b/DependencyInjection/RapsysUserExtension.php
@@ -1,7 +1,18 @@
-<?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 Rapsys\UserBundle\RapsysUserBundle;
+
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 
@@ -14,57 +25,38 @@ class RapsysUserExtension extends Extension {
        /**
         * {@inheritdoc}
         */
-       public function load(array $configs, ContainerBuilder $container) {
+       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 bundle alias
+               $alias = RapsysUserBundle::getAlias();
+
                //Detect when no user configuration is provided
                if ($configs === [[]]) {
                        //Prepend default config
-                       $container->prependExtensionConfig($this->getAlias(), $config);
+                       $container->prependExtensionConfig($alias, $config);
                }
 
                //Save configuration in parameters
-               $container->setParameter($this->getAlias(), $config);
-       }
+               $container->setParameter($alias, $config);
 
-       /**
-        * {@inheritdoc}
-        */
-       public function getAlias() {
-               return 'rapsys_user';
+               //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();
+       }
 }