Match upstream prototype

[airbundle] / DependencyInjection / RapsysAirExtension.php

diff --git a/DependencyInjection/RapsysAirExtension.php b/DependencyInjection/RapsysAirExtension.php
index a630553dc75370837032564dc2207374e50e46b4..fc0fb0b420fb3eb117ebef3c07ec0b5e707ea3fa 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,8 @@ 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;
+

 /**
  * This is the class that loads and manages your bundle configuration.
  *
 /**
  * This is the class that loads and manages your bundle configuration.
  *


@@ -20,6 +31,9 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
         * {@inheritdoc}
         */
        public function prepend(ContainerBuilder $container) {
         * {@inheritdoc}
         */
        public function prepend(ContainerBuilder $container) {

+               /* XXX: All that shit is not used anymore in theory
+                * TODO: drop it ???
+                * XXX: problem was with ignoreExtraKeys($remove = true) missing false argument

                //Load framework configurations
                //XXX: required to extract default_locale and translation.fallbacks
                $frameworks = $container->getExtensionConfig('framework');
                //Load framework configurations
                //XXX: required to extract default_locale and translation.fallbacks
                $frameworks = $container->getExtensionConfig('framework');


@@ -40,7 +54,7 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
                $container->setParameter('kernel.default_locale', $framework['default_locale']);
 
                //Load rapsys_user configurations
                $container->setParameter('kernel.default_locale', $framework['default_locale']);
 
                //Load rapsys_user configurations

-               //XXX: required to extract default_locale and translation.fallbacks
+               //XXX: required to extract class ?

                $rapsys_users = $container->getExtensionConfig('rapsys_user');
 
                //Recursively merge rapsys_user configurations
                $rapsys_users = $container->getExtensionConfig('rapsys_user');
 
                //Recursively merge rapsys_user configurations


@@ -53,7 +67,10 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
                );
 
                //Set rapsys_user.languages key
                );
 
                //Set rapsys_user.languages key

-               $container->setParameter('rapsys_user.languages', $rapsys_user['languages']);
+               $container->setParameter('rapsys_user', $rapsys_user);
+
+               //Set rapsys_user.languages key
+               $container->setParameter('rapsys_user.languages', $rapsys_user['languages']);*/

 
                //Process the configuration
                $configs = $container->getExtensionConfig($this->getAlias());
 
                //Process the configuration
                $configs = $container->getExtensionConfig($this->getAlias());


@@ -75,7 +92,7 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
 
                //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.site.icon', 'rapsys_air.site.logo', 'rapsys_air.facebook.apps', 'rapsys_air.locales', 'rapsys_air.languages']) as $k => $v) {
+               foreach($this->flatten($config, $this->getAlias(), 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);
                }
        }


@@ -89,8 +106,8 @@ class RapsysAirExtension extends Extension implements PrependExtensionInterface
        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */

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

        }
 
        /**
        }
 
        /**