From 88274df463fc72a83e8ee5df319e4147607a8e5b Mon Sep 17 00:00:00 2001
From: Dan Harper <intouch@danharper.me>
Date: Tue, 29 Apr 2014 16:01:48 +0100
Subject: [PATCH] [HttpKernel] Extract method to make callable controller in
 ControllerResolver

correct naming
---
 .../HttpKernel/Controller/ControllerResolver.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index e2e550e54267d..d875416717a59 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -78,7 +78,7 @@ public function getController(Request $request)
 
         if (false === strpos($controller, ':')) {
             if (method_exists($controller, '__invoke')) {
-                return new $controller();
+                return $this->instantiateController($controller);
             } elseif (function_exists($controller)) {
                 return $controller;
             }
@@ -167,6 +167,18 @@ protected function createController($controller)
             throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
         }
 
-        return array(new $class(), $method);
+        return array($this->instantiateController($class), $method);
+    }
+
+    /**
+     * Returns an instantiated controller
+     *
+     * @param string $class A class name
+     *
+     * @return object
+     */
+    protected function instantiateController($class)
+    {
+        return new $class();
     }
 }