From 7be00aa34ed482f20c9fb3339c6d851a2453ef12 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 3 Sep 2010 16:18:04 +0200
Subject: [PATCH] fixed previous commit

---
 .../PropelBundle/DependencyInjection/PropelExtension.php      | 2 +-
 .../Component/DependencyInjection/Dumper/GraphvizDumper.php   | 4 ++--
 .../Component/DependencyInjection/Dumper/PhpDumper.php        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php b/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
index 2ddda4e022..029a2fe048 100644
--- a/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
+++ b/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
@@ -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.');
             }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
index c5b276f48c..88837a9a0e 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
@@ -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) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 0895649411..15d522ac53 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -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);
         }