From a38069288ce2f5d37237196531200d7a7cd291cf Mon Sep 17 00:00:00 2001 From: ornicar Date: Mon, 4 Oct 2010 12:09:20 +0200 Subject: [PATCH] Fix namespace collision --- src/Symfony/Bundle/FrameworkBundle/Client.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php index 27c68b2e6a..d86217acdf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Client.php +++ b/src/Symfony/Bundle/FrameworkBundle/Client.php @@ -7,7 +7,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Client as BaseClient; use Symfony\Component\BrowserKit\History; use Symfony\Component\BrowserKit\CookieJar; -use Symfony\Component\HttpKernel\Profiler\Profiler; +use Symfony\Component\HttpKernel\Profiler\Profiler as HttpProfiler; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -67,7 +67,7 @@ class Client extends BaseClient /** * Gets a profiler for the current Response. * - * @return Profiler A Profiler instance + * @return HttpProfiler A Profiler instance */ public function getProfiler() {