Merge pull request #21 from roukmoute/fix_config

Fix parameter definition and move to the top config processing in the extension
goaop · Feb 9, 2018 · 57673ba · 57673ba
2 parents 0433bf2 + a3264da
commit 57673ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/DependencyInjection/GoAopExtension.php b/DependencyInjection/GoAopExtension.php
@@ -47,6 +47,10 @@ public function getXsdValidationBasePath()
      */
     public function load(array $config, ContainerBuilder $container)
     {
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load('services.xml');
+        $loader->load('commands.xml');
+
         $configurator = new Configuration();
         $config       = $this->processConfiguration($configurator, $config);
 
@@ -58,10 +62,6 @@ public function load(array $config, ContainerBuilder $container)
         }
         $container->setParameter('goaop.options', $normalizedOptions);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load('services.xml');
-        $loader->load('commands.xml');
-
         if ($config['cache_warmer']) {
             $definition = $container->getDefinition('goaop.cache.warmer');
             $definition->addTag('kernel.cache_warmer');

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -5,7 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter id="goaop.options" type="collection"/>
+        <parameter key="goaop.options" type="collection"/>
     </parameters>
 
     <services>