From 42a68d9ca4cc0b8136b1f39df2b7fb124de0e8fa Mon Sep 17 00:00:00 2001
From: Kris Wallsmith <kris.wallsmith@gmail.com>
Date: Wed, 16 Feb 2011 08:00:35 -0800
Subject: [PATCH] [AsseticBundle] renamed controller class

---
 .../Controller/{Controller.php => AsseticController.php}        | 2 +-
 .../Bundle/AsseticBundle/Resources/config/controller.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/Symfony/Bundle/AsseticBundle/Controller/{Controller.php => AsseticController.php} (98%)

diff --git a/src/Symfony/Bundle/AsseticBundle/Controller/Controller.php b/src/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php
similarity index 98%
rename from src/Symfony/Bundle/AsseticBundle/Controller/Controller.php
rename to src/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php
index 4c1da0b4f4..b35408944a 100644
--- a/src/Symfony/Bundle/AsseticBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php
@@ -21,7 +21,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  *
  * @author Kris Wallsmith <kris.wallsmith@symfony-project.com>
  */
-class Controller
+class AsseticController
 {
     protected $request;
     protected $response;
diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml
index e4b8e7b4c2..efc2fa8463 100644
--- a/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml
+++ b/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="assetic.controller.class">Symfony\Bundle\AsseticBundle\Controller\Controller</parameter>
+        <parameter key="assetic.controller.class">Symfony\Bundle\AsseticBundle\Controller\AsseticController</parameter>
         <parameter key="assetic.routing_loader.class">Symfony\Bundle\AsseticBundle\Routing\AsseticLoader</parameter>
     </parameters>