X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/e3ea38209d18dc220067e27b526dbff7cc838670..b31612d28cf2a5617667dd9dae62379c90dbaf1c:/DependencyInjection/RapsysPackExtension.php?ds=inline

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 7d66000..e1f1996 100644
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -1,48 +1,59 @@
-<?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);
 
-		//Set default config in parameter
-		if (!$container->hasParameter($alias = $this->getAlias())) {
-			$container->setParameter($alias, $config[$alias]);
+		//Detect when no user configuration is provided
+		if ($configs === [[]]) {
+			//Prepend default config
+			$container->prependExtensionConfig(self::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/');
+		//Save configuration in parameters
+		$container->setParameter(self::getAlias(), $config);
+
+		//Set rapsys_pack.public.path key
+		$container->setParameter(self::getAlias().'.public.path', $config['public']['path']);
+
+		//Set rapsys_pack.public.url key
+		$container->setParameter(self::getAlias().'.public.url', $config['public']['url']);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getAlias() {
-		return 'rapsys_pack';
+	public function getAlias(): string {
+		return RapsysPackBundle::getAlias();
 	}
 }