diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed previous commit

Browse Source
This commit is contained in:
Fabien Potencier 2010-09-03 16:18:04 +02:00
parent 179fe8e623
commit 7be00aa34e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
View File

@ -27,7 +27,7 @@ class PropelExtension extends Extension
$loader->load($this->resources['propel']);
}
if (!$container->has('propel.path')) {
if (!$container->hasParameter('propel.path')) {
if (!isset($config['path'])) {
throw new \InvalidArgumentException('The "path" parameter is mandatory.');
}

4
src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
View File

@ -109,9 +109,9 @@ class GraphvizDumper extends Dumper
$edges = array();
foreach ($arguments as $argument) {
if (is_object($argument) && $argument instanceof Parameter) {
$argument = $this->container->has($argument) ? $this->container->getParameter($argument) : null;
$argument = $this->container->hasParameter($argument) ? $this->container->getParameter($argument) : null;
} elseif (is_string($argument) && preg_match('/^%([^%]+)%$/', $argument, $match)) {
$argument = $this->container->has($match[1]) ? $this->container->getParameter($match[1]) : null;
$argument = $this->container->hasParameter($match[1]) ? $this->container->getParameter($match[1]) : null;
}
if ($argument instanceof Reference) {

2
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -412,7 +412,7 @@ EOF;
public function dumpParameter($name)
{
if ($this->container->isFrozen() && $this->container->has($name)) {
if ($this->container->isFrozen() && $this->container->hasParameter($name)) {
return $this->dumpValue($this->container->getParameter($name), false);
}