Merge pull request symfony#560 from hhamon/fix_request_references

Fix request references

Author: weaverryan

book/http_cache.rst

@@ -545,9 +545,9 @@ md5 of the content::
 
  public function indexAction()
  {
- $response = $this->renderView('MyBundle:Main:index.html.twig');
+ $response = $this->render('MyBundle:Main:index.html.twig');
  $response->setETag(md5($response->getContent()));
- $response->isNotModified($this->get('request'));
+ $response->isNotModified($this->getRequest());
 
  return $response;
  }
@@ -598,7 +598,7 @@ header value::
  $date = $authorDate > $articleDate ? $authorDate : $articleDate;
 
  $response->setLastModified($date);
- $response->isNotModified($this->get('request'));
+ $response->isNotModified($this->getRequest());
 
  return $response;
  }
@@ -643,7 +643,7 @@ exposing a simple and efficient pattern::
  $response->setLastModified($article->getPublishedAt());
 
  // Check that the Response is not modified for the given Request
- if ($response->isNotModified($this->get('request'))) {
+ if ($response->isNotModified($this->getRequest())) {
  // return the 304 Response immediately
  return $response;
  } else {
@@ -835,7 +835,7 @@ independent of the rest of the page.
 
  public function indexAction()
  {
- $response = $this->renderView('MyBundle:MyController:index.html.twig');
+ $response = $this->render('MyBundle:MyController:index.html.twig');
  $response->setSharedMaxAge(600);
 
  return $response;

book/security.rst

@@ -403,16 +403,19 @@ Next, create the controller that will display the login form:
  {
  public function loginAction()
  {
+ $request = $this->getRequest();
+ $session = $request->getSession();
+
  // get the login error if there is one
- if ($this->get('request')->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {
- $error = $this->get('request')->attributes->get(SecurityContext::AUTHENTICATION_ERROR);
+ if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {
+ $error = $request->attributes->get(SecurityContext::AUTHENTICATION_ERROR);
  } else {
- $error = $this->get('request')->getSession()->get(SecurityContext::AUTHENTICATION_ERROR);
+ $error = $session->get(SecurityContext::AUTHENTICATION_ERROR);
  }
 
  return $this->render('AcmeSecurityBundle:Security:login.html.twig', array(
  // last username entered by the user
- 'last_username' => $this->get('request')->getSession()->get(SecurityContext::LAST_USERNAME),
+ 'last_username' => $session->get(SecurityContext::LAST_USERNAME),
  'error' => $error,
  ));
  }

book/templating.rst

@@ -1155,7 +1155,7 @@ pattern is to do the following:
 
  public function indexAction()
  {
- $format = $this->get('request')->getRequestFormat();
+ $format = $this->getRequest()->getRequestFormat();
  
  return $this->render('AcmeBlogBundle:Blog:index.'.$format.'.twig');
  }

cookbook/form/simple_signup_form_with_mongodb.rst

@@ -255,7 +255,7 @@ the validation and saves the data into MongoDB::
 
  $form = $this->createForm(new RegistrationType(), new Registration());
 
- $form->bindRequest($this->get('request'));
+ $form->bindRequest($this->getRequest());
 
  if ($form->isValid()) {
  $registration = $form->getData();

quick_tour/the_controller.rst

@@ -88,7 +88,7 @@ Getting information from the Request
 Besides the values of the routing placeholders, the controller also has access
 to the ``Request`` object::
 
- $request = $this->get('request');
+ $request = $this->getRequest();
 
  $request->isXmlHttpRequest(); // is it an Ajax request?
 
@@ -118,7 +118,7 @@ by using native PHP sessions.
 Storing and retrieving information from the session can be easily achieved
 from any controller::
 
- $session = $this->get('request')->getSession();
+ $session = $this->getRequest()->getSession();
 
  // store an attribute for reuse during a later user request
  $session->set('foo', 'bar');