Skip to content

Commit f74f36f

Browse files
committed
FIX getConfiguration() call
1 parent b2d3d9e commit f74f36f

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

AdmingeneratorGeneratorBundle.php

+11
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@ public function build(ContainerBuilder $container)
3939
$container->addCompilerPass(new FormCompilerPass());
4040
}
4141

42+
/**
43+
* (non-PHPdoc)
44+
* @see \Symfony\Component\HttpKernel\Bundle\Bundle::getContainerExtension()
45+
*/
46+
public function getContainerExtension()
47+
{
48+
$this->extension = new DependencyInjection\AdmingeneratorGeneratorExtension();
49+
50+
return $this->extension;
51+
}
52+
4253
/**
4354
* Initialize Admingenerator Class loader
4455
*

DependencyInjection/AdmingeneratorGeneratorExtension.php

+12-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
88
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
99
use Symfony\Component\Config\FileLocator;
10-
use Symfony\Component\Config\Definition\Processor;
1110
use Symfony\Component\DependencyInjection\Definition;
1211
use Symfony\Component\DependencyInjection\Reference;
1312

@@ -38,9 +37,7 @@ public function load(array $configs, ContainerBuilder $container)
3837
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
3938
$loader->load('services.xml');
4039

41-
$processor = new Processor();
42-
$configuration = new Configuration($this->getAlias());
43-
$config = $processor->processConfiguration($configuration, $configs);
40+
$config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
4441

4542
$container->setParameter('admingenerator.overwrite_if_exists', $config['overwrite_if_exists']);
4643
$container->setParameter('admingenerator.base_admin_template', $config['base_admin_template']);
@@ -165,6 +162,17 @@ protected function addCacheProviderToGenerator($cacheProviderServiceName, Defini
165162
));
166163
}
167164

165+
/**
166+
* @return \Admingenerator\GeneratorBundle\DependencyInjection\Configuration
167+
*/
168+
public function getConfiguration(array $config, ContainerBuilder $container)
169+
{
170+
return new Configuration($this->getAlias());
171+
}
172+
173+
/**
174+
* @return string
175+
*/
168176
public function getAlias()
169177
{
170178
return 'admingenerator_generator';

0 commit comments

Comments
 (0)