Cleanup

[packbundle] / DependencyInjection / RapsysPackExtension.php

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 5397036876f65a11a5ab899c58aea423977d2d6b..fc9efcebcb19db954d30711c3c7682d1248af9e4 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -1,41 +1,67 @@
-<?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(__DIR__.'/../Resources/config'));
-               $loader->load('services.yml');
-
+       public function load(array $configs, ContainerBuilder $container): void {

                //Load configuration
                $configuration = $this->getConfiguration($configs, $container);
                //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]);
+               //Set bundle alias
+               $alias = RapsysPackBundle::getAlias();
+
+               //Detect when no user configuration is provided
+               if ($configs === [[]]) {
+                       //Prepend default config
+                       $container->prependExtensionConfig($alias, $config);

                }
                }

+
+               //Save configuration in parameters
+               $container->setParameter($alias, $config);
+
+               //Set rapsyspack.alias key
+               $container->setParameter($alias.'.alias', $alias);
+
+               //Set rapsyspack.path key
+               $container->setParameter($alias.'.path', $config['path']);
+
+               //Set rapsyspack.version key
+               $container->setParameter($alias.'.version', RapsysPackBundle::getVersion());

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

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

         */
         */

-       public function getConfiguration(array $configs, ContainerBuilder $container) {
-               //Get configuration instance with resolved web path
-               return new Configuration($container->getParameter('kernel.project_dir').'/web/');
+       public function getAlias(): string {
+               return RapsysPackBundle::getAlias();

        }
 }
        }
 }