deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated load config according to the last Symfony2 version

Browse source
This commit is contained in:
William DURAND 2011-02-23 16:29:29 +01:00
parent 08317bdd77
commit a5b87639a0
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
DependencyInjection/PropelExtension.php
View file

@ -19,6 +19,13 @@ class PropelExtension extends Extension
*/
public function load(array $configs, ContainerBuilder $container)
{
$dbal = array();
foreach ($configs as $config) {
if (isset($config['dbal'])) {
$dbal[] = $config['dbal'];
}
}
$config = $configs[0];
if (!$container->hasDefinition('propel')) {
@ -48,6 +55,10 @@ class PropelExtension extends Extension
$charset = 'UTF8';
}
$container->setParameter('propel.charset', $charset);
if (!empty($dbal)) {
$this->dbalLoad($dbal, $container);
}
}
/**
@ -56,7 +67,7 @@ class PropelExtension extends Extension
* @param array $configs An array of configuration settings
* @param ContainerBuilder $container A ContainerBuilder instance
*/
public function dbalLoad(array $configs, ContainerBuilder $container)
protected function dbalLoad(array $configs, ContainerBuilder $container)
{
if (!$container->hasDefinition('propel')) {
$loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');