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

Merge pull request #278 from benja-M-1/fix/paths-from-config

Browse source 
Use the configured paths for Porpel and Phing
This commit is contained in:
Toni Uebernickel 2014-11-01 14:45:18 +01:00
parent 85879f8b33 4acee59d80
commit 1e667f256f
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
DependencyInjection/PropelExtension.php
View file

@ -44,20 +44,16 @@ class PropelExtension extends Extension
$container->setParameter('propel.phing_path', $phingPath); $container->setParameter('propel.phing_path', $phingPath);
} }
if (!$container->hasParameter('propel.path')) { if (isset($config['path'])) {
if (!isset($config['path'])) { $container->setParameter('propel.path', $config['path']);
throw new \InvalidArgumentException('PropelBundle expects a "path" parameter that must contain the absolute path to the Propel ORM vendor library. The "path" parameter must be defined under the "propel" root node in your configuration.'); } elseif (!$container->hasParameter('propel.path')) {
} else { throw new \InvalidArgumentException('PropelBundle expects a "path" parameter that must contain the absolute path to the Propel ORM vendor library. The "path" parameter must be defined under the "propel" root node in your configuration.');
$container->setParameter('propel.path', $config['path']);
}
} }
if (!$container->hasParameter('propel.phing_path')) { if (isset($config['phing_path'])) {
if (!isset($config['phing_path'])) { $container->setParameter('propel.phing_path', $config['phing_path']);
} elseif (!$container->hasParameter('propel.phing_path')) {
throw new \InvalidArgumentException('PropelBundle expects a "phing_path" parameter that must contain the absolute path to the Phing vendor library. The "phing_path" parameter must be defined under the "propel" root node in your configuration.'); throw new \InvalidArgumentException('PropelBundle expects a "phing_path" parameter that must contain the absolute path to the Phing vendor library. The "phing_path" parameter must be defined under the "propel" root node in your configuration.');
} else {
$container->setParameter('propel.phing_path', $config['phing_path']);
}
} }
if (isset($config['logging']) && $config['logging']) { if (isset($config['logging']) && $config['logging']) {