Remove getAlias member function

[airbundle] / DependencyInjection / RapsysAirExtension.php

diff --git a/DependencyInjection/RapsysAirExtension.php b/DependencyInjection/RapsysAirExtension.php
index 76729ae136f9738b4b3d65aecba86785b363a266..cdfc0c4a209c5dafcb21418310f6dc619c7962d3 100644 (file)
--- 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;
 
 
 namespace Rapsys\AirBundle\DependencyInjection;
 


@@ -7,6 +16,10 @@ use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 
 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.
  *
 /**
  * This is the class that loads and manages your bundle configuration.
  *


@@ -14,14 +27,30 @@ use Symfony\Component\Translation\Loader\ArrayLoader;
  */
 class RapsysAirExtension extends Extension implements PrependExtensionInterface {
        /**
  */
 class RapsysAirExtension extends Extension implements PrependExtensionInterface {
        /**

+        * {@inheritdoc}
+        *

         * Prepend the configuration
         *
         * Prepend the configuration
         *

-        * @desc Preload the configuration to allow sourcing as parameters
-        * {@inheritdoc}
+        * Preload the configuration to allow sourcing as parameters

         */
         */

-       public function prepend(ContainerBuilder $container) {
+       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);
+                       },
+                       []
+               );
+
+               //Set rapsysuser.languages key
+               $container->setParameter($alias, $rapsysuser);*/
+

                //Process the configuration
                //Process the configuration

-               $configs = $container->getExtensionConfig($this->getAlias());
+               $configs = $container->getExtensionConfig($alias = RapsysAirBundle::getAlias());

 
                //Load configuration
                $configuration = $this->getConfiguration($configs, $container);
 
                //Load configuration
                $configuration = $this->getConfiguration($configs, $container);


@@ -32,14 +61,15 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
                //Detect when no user configuration is provided
                if ($configs === [[]]) {
                        //Prepend default config
                //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
                }
 
                //Save configuration in parameters

-               $container->setParameter($this->getAlias(), $config);
+               $container->setParameter($alias, $config);

 
                //Store flattened array in parameters
 
                //Store flattened array in parameters

-               foreach($this->flatten($config, $this->getAlias()) as $k => $v) {
+               //XXX: don't flatten rapsys_air.site.png key which is required to be an array
+               foreach($this->flatten($config, $alias, 10, '.', ['rapsys_air.copy', 'rapsys_air.icon', 'rapsys_air.icon.png', 'rapsys_air.logo', 'rapsys_air.facebook.apps', 'rapsys_air.locales', 'rapsys_air.languages']) as $k => $v) {

                        $container->setParameter($k, $v);
                }
        }
                        $container->setParameter($k, $v);
                }
        }


@@ -47,14 +77,7 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

-       public function load(array $configs, ContainerBuilder $container) {
-       }
-
-       /**
-        * {@inheritdoc}
-        */
-       public function getAlias() {
-               return 'rapsys_air';
+       public function load(array $configs, ContainerBuilder $container): void {

        }
 
        /**
        }
 
        /**


@@ -64,19 +87,21 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
         * @param $path         The current key path
         * @param $depth        The maxmium depth
         * @param $sep          The separator string
         * @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 = '.') {
+       protected function flatten($array, $path = '', $depth = 10, $sep = '.', $skip = []) {

                //Init res
                $res = array();
 
                //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)) {
+               //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;
                        foreach($array as $k => $v) {
                                $sub = $path ? $path.$sep.$k:$k;

-                               $res += $this->flatten($v, $sub, $depth - 1, $sep);
+                               $res += $this->flatten($v, $sub, $depth - 1, $sep, $skip);

                        }
                //Pass scalar value directly
                } else {
                        }
                //Pass scalar value directly
                } else {