Skip to content

Commit

Permalink
Load xml configuration first
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathias STRASSER committed Feb 9, 2018
1 parent 0433bf2 commit a3264da
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions DependencyInjection/GoAopExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion Resources/config/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit a3264da

Please sign in to comment.