[WebBundle] made the request instance explicit in the controller base class (useful if you inject the request for testing purpose)

fabpot · fabpot · commit 8fe25d343bea · 2010-05-03T11:17:02.000+02:00
diff --git a/src/Symfony/Framework/WebBundle/Controller.php b/src/Symfony/Framework/WebBundle/Controller.php
@@ -3,6 +3,7 @@
 namespace Symfony\Framework\WebBundle;
 
 use Symfony\Components\DependencyInjection\ContainerInterface;
+use Symfony\Components\RequestHandler\Request;
 use Symfony\Components\RequestHandler\Response;
 
 /*
@@ -24,6 +25,7 @@
 class Controller
 {
   protected $container;
+  protected $request;
 
   function __construct(ContainerInterface $container)
   {
@@ -32,7 +34,17 @@ function __construct(ContainerInterface $container)
 
   public function getRequest()
   {
-    return $this->container->getRequestService();
+    if (null === $this->request)
+    {
+      $this->request = $this->container->getRequestService();
+    }
+
+    return $this->request;
+  }
+
+  public function setRequest(Request $request)
+  {
+    return $this->request = $request;
   }
 
   public function getUser()
diff --git a/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php b/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php
@@ -69,6 +69,7 @@ public function resolve(Event $event)
     }
 
     $controller = $this->findController($bundle, $controller, $action);
+    $controller[0]->setRequest($request);
 
     $r = new \ReflectionObject($controller[0]);
     $arguments = $this->getMethodArguments($r->getMethod($controller[1]), $event->getParameter('request')->path->all(), sprintf('%s::%s()', get_class($controller[0]), $controller[1]));

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public function resolve(Event $event)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`$controller = $this->findController($bundle, $controller, $action);`
	`72`	`+ $controller[0]->setRequest($request);`
`72`	`73`
`73`	`74`	`$r = new \ReflectionObject($controller[0]);`
`74`	`75`	`$arguments = $this->getMethodArguments($r->getMethod($controller[1]), $event->getParameter('request')->path->all(), sprintf('%s::%s()', get_class($controller[0]), $controller[1]));`