Move alias generation in RapsysPackBundle::getAlias

[packbundle] / DependencyInjection / RapsysPackExtension.php

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 97bb11f3b23c0200688e169dda382edc6cfa7a0f..94b9fadf9cf4b180655fb88f2a12e23d7272f75f 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -1,36 +1,53 @@
-<?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;
 
 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;
+
+use Rapsys\PackBundle\RapsysPackBundle;
 
 /**
  * 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}
         */
-       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);
+
+               //Process the configuration to get merged config
                $config = $this->processConfiguration($configuration, $configs);
+
+               //Detect when no user configuration is provided
+               if ($configs === [[]]) {
+                       //Prepend default config
+                       $container->prependExtensionConfig($this->getAlias(), $config);
+               }
+
+               //Save configuration in parameters
+               $container->setParameter($this->getAlias(), $config);
        }
 
        /**
         * {@inheritdoc}
         */
-       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();
        }
 }