Shorten air bundle alias

[airbundle] / DependencyInjection / RapsysAirExtension.php

diff --git a/DependencyInjection/RapsysAirExtension.php b/DependencyInjection/RapsysAirExtension.php
index e00159b340f0724418d525736cd9e24e421dab66..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,49 +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) {
-               //Load framework configurations
-               //XXX: required to extract default_locale and translation.fallbacks
-               $frameworks = $container->getExtensionConfig('framework');
-
-               //Recursively merge framework configurations
-               $framework = array_reduce(
-                       $frameworks,
-                       function ($res, $i) {
-                               return array_merge_recursive($res, $i);
-                       },
-                       []
-               );
-
-               //Set translator fallbacks
-               $container->setParameter('kernel.translator.fallbacks', $framework['translator']['fallbacks']);
-
-               //Set default locale
-               $container->setParameter('kernel.default_locale', $framework['default_locale']);
-
-               //Load rapsys_user configurations
-               //XXX: required to extract default_locale and translation.fallbacks
-               $rapsys_users = $container->getExtensionConfig('rapsys_user');
+       public function prepend(ContainerBuilder $container): void {
+               /*Load rapsysuser configurations
+               $rapsysusers = $container->getExtensionConfig($alias = RapsysUserBundle::getAlias());

 
 

-               //Recursively merge rapsys_user configurations
-               $rapsys_user = array_reduce(
-                       $rapsys_users,
+               //Recursively merge rapsysuser configurations
+               $rapsysuser = array_reduce(
+                       $rapsysusers,

                        function ($res, $i) {
                                return array_merge_recursive($res, $i);
                        },
                        []
                );
 
                        function ($res, $i) {
                                return array_merge_recursive($res, $i);
                        },
                        []
                );
 

-               //Set rapsys_user.languages key
-               $container->setParameter('rapsys_user.languages', $rapsys_user['languages']);
+               //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);


@@ -67,15 +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
                //XXX: don't flatten rapsys_air.site.png key which is required to be an array
 
                //Store flattened array in parameters
                //XXX: don't flatten rapsys_air.site.png key which is required to be an array

-               foreach($this->flatten($config, $this->getAlias(), 10, '.', ['rapsys_air.site.png', 'rapsys_air.locales', 'rapsys_air.languages']) as $k => $v) {
+               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);
                }
        }


@@ -83,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 {

        }
 
        /**
        }
 
        /**