From: Raphaël Gertz <git@rapsys.eu>
Date: Mon, 28 Oct 2019 18:21:50 +0000 (+0100)
Subject: Update to 4.x new path
X-Git-Tag: 0.1.0
X-Git-Url: https://git.rapsys.eu/packbundle/commitdiff_plain/7a2bed7826daa04288eed02b303f6194f8908566?ds=sidebyside

Update to 4.x new path
Change path of configuration file
Add parameters merging code
---

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 7d66000..c844233 100644
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -18,8 +18,9 @@ class RapsysPackExtension extends Extension {
 	 */
 	public function load(array $configs, ContainerBuilder $container) {
 		//Load configuration
-		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-		$loader->load('services.yml');
+		#$loader = new Loader\YamlFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
+		$loader = new Loader\YamlFileLoader($container, new FileLocator('config/packages'));
+		$loader->load($this->getAlias().'.yaml');
 
 		//Load configuration
 		$configuration = $this->getConfiguration($configs, $container);
@@ -28,6 +29,43 @@ class RapsysPackExtension extends Extension {
 		//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;
+
+			//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;
+				}
+			}
+
+			//Check if change occured
+			if ($change) {
+				//Save parameters
+				$container->setParameter($alias, $config[$alias]);
+			}
 		}
 	}
 
@@ -35,8 +73,8 @@ class RapsysPackExtension extends Extension {
 	 * {@inheritdoc}
 	 */
 	public function getConfiguration(array $configs, ContainerBuilder $container) {
-		//Get configuration instance with resolved web path
-		return new Configuration($container->getParameter('kernel.project_dir').'/web/');
+		//Get configuration instance with resolved public path
+		return new Configuration($container->getParameter('kernel.project_dir').'/public/');
 	}
 
 	/**