Version 0.5.5

[packbundle] / DependencyInjection / RapsysPackExtension.php

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index bc155fc6a0cd6925e7885cd2144c0c1211737753..3a6ed53cbf716ca0ed208484b06661217ba0df0c 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -1,85 +1,70 @@
-<?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\PackBundle\DependencyInjection;
 
 
 namespace Rapsys\PackBundle\DependencyInjection;
 

+use Rapsys\PackBundle\RapsysPackBundle;
+

 use Symfony\Component\DependencyInjection\ContainerBuilder;
 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;

 
 /**
  * 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

+ *
+ * {@inheritdoc}

  */
 class RapsysPackExtension extends Extension {
        /**
         * {@inheritdoc}
         */
  */
 class RapsysPackExtension extends Extension {
        /**
         * {@inheritdoc}
         */

-       public function load(array $configs, ContainerBuilder $container) {
-               //Load configuration
-               $loader = new Loader\YamlFileLoader($container, new FileLocator('config/packages'));
-               $loader->load($this->getAlias().'.yaml');
-
+       public function load(array $configs, ContainerBuilder $container): void {

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

-               $config = $this->processConfiguration($configuration, $configs);

 
 

-               //Set default config in parameter
-               if (!$container->hasParameter($alias = $this->getAlias())) {
-                       $container->setParameter($alias, $config[$alias]);
-               //Fill missing entries
-               } else {
-                       //Change in config flag
-                       $change = false;
+               //Process the configuration to get merged config
+               $config = $this->processConfiguration($configuration, $configs);

 
 

-                       //Iterate on each user configuration keys
-                       foreach($container->getParameter($alias) as $k => $v) {
-                               //Check if value is an array
-                               if (is_array($v)) {
-                                       //Iterate on each array keys
-                                       foreach($v as $sk => $sv) {
-                                               //Check if sub value is an array
-                                               if (is_array($sv)) {
-                                                       //TODO: implement sub sub key merging ? (or recursive ?)
-                                                       @trigger_error('Nested level > 2 not yet implemented here', E_USER_ERROR);
-                                               //Save sub value
-                                               } else {
-                                                       //Trigger changed flag
-                                                       $change = true;
-                                                       //Replace default value with user provided one
-                                                       $config[$alias][$k][$sk] = $sv;
-                                               }
-                                       }
-                               //Save value
-                               } else {
-                                       //Trigger changed flag
-                                       $change = true;
-                                       //Replace default value with user provided one
-                                       $config[$alias][$k] = $v;
-                               }
-                       }
+               //Set bundle alias
+               $alias = RapsysPackBundle::getAlias();

 
 

-                       //Check if change occured
-                       if ($change) {
-                               //Save parameters
-                               $container->setParameter($alias, $config[$alias]);
-                       }
+               //Detect when no user configuration is provided
+               if ($configs === [[]]) {
+                       //Prepend default config
+                       $container->prependExtensionConfig($alias, $config);

                }
                }

-       }

 
 

-       /**
-        * {@inheritdoc}
-        */
-       public function getConfiguration(array $configs, ContainerBuilder $container) {
-               //Get configuration instance with resolved public path
-               return new Configuration($container->getParameter('kernel.project_dir').'/public/');
+               //Save configuration in parameters
+               $container->setParameter($alias, $config);
+
+               //Set rapsyspack.alias key
+               $container->setParameter($alias.'.alias', $alias);
+
+               //Set rapsyspack.cache key
+               $container->setParameter($alias.'.cache', $config['cache']);
+
+               //Set rapsyspack.public key
+               $container->setParameter($alias.'.public', $config['public']);
+
+               //Set rapsyspack.version key
+               $container->setParameter($alias.'.version', RapsysPackBundle::getVersion());

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

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

         */
         */

-       public function getAlias() {
-               return 'rapsys_pack';
+       public function getAlias(): string {
+               return RapsysPackBundle::getAlias();

        }
 }
        }
 }