Skip to content

Commit 57673ba

Browse files
authored
Merge pull request #21 from roukmoute/fix_config
Fix parameter definition and move to the top config processing in the extension
2 parents 0433bf2 + a3264da commit 57673ba

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

DependencyInjection/GoAopExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ public function getXsdValidationBasePath()
4747
*/
4848
public function load(array $config, ContainerBuilder $container)
4949
{
50+
$loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
51+
$loader->load('services.xml');
52+
$loader->load('commands.xml');
53+
5054
$configurator = new Configuration();
5155
$config = $this->processConfiguration($configurator, $config);
5256

@@ -58,10 +62,6 @@ public function load(array $config, ContainerBuilder $container)
5862
}
5963
$container->setParameter('goaop.options', $normalizedOptions);
6064

61-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
62-
$loader->load('services.xml');
63-
$loader->load('commands.xml');
64-
6565
if ($config['cache_warmer']) {
6666
$definition = $container->getDefinition('goaop.cache.warmer');
6767
$definition->addTag('kernel.cache_warmer');

Resources/config/services.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<parameters>
8-
<parameter id="goaop.options" type="collection"/>
8+
<parameter key="goaop.options" type="collection"/>
99
</parameters>
1010

1111
<services>

0 commit comments

Comments
 (0)