Fix subscribed key name

[airbundle] / DependencyInjection / RapsysAirExtension.php

diff --git a/DependencyInjection/RapsysAirExtension.php b/DependencyInjection/RapsysAirExtension.php
index 5a2bdfff5d15169adcc1443cbedb4faa3101f4ca..b09b135eccd1749f2a9b2018d5721c0c3183429e 100644 (file)
--- a/DependencyInjection/RapsysAirExtension.php
+++ b/DependencyInjection/RapsysAirExtension.php
@@ -1,46 +1,129 @@
-<?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;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 namespace Rapsys\AirBundle\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 Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\Translation\Loader\ArrayLoader;
+
+use Rapsys\AirBundle\RapsysAirBundle;
+
+use Rapsys\UserBundle\RapsysUserBundle;

 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
  * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
  * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
  */

-class RapsysAirExtension extends Extension {
+class RapsysAirExtension extends Extension implements PrependExtensionInterface {

        /**
         * {@inheritdoc}
        /**
         * {@inheritdoc}

+        *
+        * Prepend the configuration
+        *
+        * Preload the configuration to allow sourcing as parameters

         */
         */

-       public function load(array $configs, ContainerBuilder $container) {
-               $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-               $loader->load('services.yml');
+       public function prepend(ContainerBuilder $container): void {
+               /*Load rapsysuser configurations
+               $rapsysusers = $container->getExtensionConfig($alias = RapsysUserBundle::getAlias());
+
+               //Recursively merge rapsysuser configurations
+               $rapsysuser = array_reduce(
+                       $rapsysusers,
+                       function ($res, $i) {
+                               return array_merge_recursive($res, $i);
+                       },
+                       []
+               );

 
 

-               $configuration = new Configuration();
+               //Set rapsysuser.languages key
+               $container->setParameter($alias, $rapsysuser);*/
+
+               //Process the configuration
+               $configs = $container->getExtensionConfig($alias = RapsysAirBundle::getAlias());
+
+               //Load configuration
+               $configuration = $this->getConfiguration($configs, $container);
+
+               //Process the configuration to get merged config

                $config = $this->processConfiguration($configuration, $configs);
 
                $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);
+               //Detect when no user configuration is provided
+               if ($configs === [[]]) {
+                       //Prepend default config
+                       $container->prependExtensionConfig($alias, $config);
+               }
+
+               //Save configuration in parameters
+               $container->setParameter($alias, $config);
+
+               //Store flattened array in parameters
+               //XXX: don't flatten rapsysair.site.png key which is required to be an array
+               foreach($this->flatten($config, $alias, 10, '.', ['rapsysair.copy', 'rapsysair.icon', 'rapsysair.icon.png', 'rapsysair.logo', 'rapsysair.facebook.apps', 'rapsysair.locales', 'rapsysair.languages']) as $k => $v) {
+                       $container->setParameter($k, $v);

                }
 
                }
 

-               //Transform the one level tree in flat parameters
-               foreach($config[$alias] as $k => $v) {
-                       //Set is as parameters
-                       $container->setParameter($alias.'.'.$k, $v);
+               //Set rapsysair.alias key
+               $container->setParameter($alias.'.alias', $alias);
+
+               //Set rapsysair.version key
+               $container->setParameter($alias.'.version', RapsysAirBundle::getVersion());
+       }
+
+       /**
+        * {@inheritdoc}
+        */
+       public function load(array $configs, ContainerBuilder $container): void {
+       }
+
+       /**
+        * 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
+        * @param $skip         The skipped paths array
+        */
+       protected function flatten($array, $path = '', $depth = 10, $sep = '.', $skip = []) {
+               //Init res
+               $res = array();
+
+               //Detect numerical only array
+               //count(array_filter($array, function($k) { return !is_numeric($k); }, ARRAY_FILTER_USE_KEY)) == 0
+               //array_reduce(array_keys($array), function($c, $k) { return $c += !is_numeric($k); }, 0)
+
+               //Flatten hashed array until depth reach zero
+               if ($depth && is_array($array) && $array !== [] && !in_array($path, $skip)) {
+                       foreach($array as $k => $v) {
+                               $sub = $path ? $path.$sep.$k:$k;
+                               $res += $this->flatten($v, $sub, $depth - 1, $sep, $skip);
+                       }
+               //Pass scalar value directly
+               } else {
+                       $res[$path] = $array;

                }
                }

+
+               //Return result
+               return $res;

        }
 
        /**
         * {@inheritdoc}
        }
 
        /**
         * {@inheritdoc}

+        *
+        * @xxx Required by kernel to load renamed alias configuration

         */
         */

-       public function getAlias() {
-               return 'rapsys_air';
+       public function getAlias(): string {
+               return RapsysAirBundle::getAlias();

        }
 }
        }
 }