Fix confirm route user controller method

[userbundle] / DependencyInjection / RapsysUserExtension.php

diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php
index 1c1d1cf7d6ef2cfc66e5184d718a1cd4e1218c58..d69ee4df0405b10f6d50fb3e04a7e7343a77cd57 100644 (file)
--- a/DependencyInjection/RapsysUserExtension.php
+++ b/DependencyInjection/RapsysUserExtension.php
@@ -1,12 +1,21 @@
-<?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;
 
-use Rapsys\UserBundle\RapsysUserBundle;
-
 /**
  * This is the class that loads and manages your bundle configuration.
  *
@@ -16,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(self::getAlias(), $config);
+                       $container->prependExtensionConfig($alias, $config);
                }
 
                //Save configuration in parameters
-               $container->setParameter(self::getAlias(), $config);
+               $container->setParameter($alias, $config);
+
+               //Set rapsysuser.alias key
+               $container->setParameter($alias.'.alias', $alias);
+
+               //Set rapsysuser.version key
+               $container->setParameter($alias.'.version', RapsysUserBundle::getVersion());
        }
 
        /**
         * {@inheritdoc}
+        *
+        * @xxx Required by kernel to load renamed alias configuration
         */
        public function getAlias(): string {
                return RapsysUserBundle::getAlias();
        }
-
-       /**
-        * The function that parses the array to flatten it into a one level depth array
-        *
-        * @param $array        The config values array
-        * @param $path         The current key path
-        * @param $depth        The maxmium depth
-        * @param $sep          The separator string
-        */
-       /*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;
-       }*/
 }