Merge branch 'added-request-usage' of github.com:dlsniper/symfony-docs into dlsniper-added-request-usage

weaverryan · weaverryan · commit 43aa772f2776 · 2013-01-22T07:09:59.000-08:00
Conflicts:
	book/controller.rst
	book/http_fundamentals.rst
diff --git a/book/controller.rst b/book/controller.rst
@@ -493,6 +493,8 @@ that's responsible for generating the HTML (or other format) for the controller.
 The ``renderView()`` method renders a template and returns its content. The
 content from the template can be used to create a ``Response`` object::
 
+    use Symfony\Component\HttpFoundation\Response;
+
     $content = $this->renderView(
         'AcmeHelloBundle:Hello:index.html.twig',
         array('name' => $name)
@@ -708,6 +710,8 @@ The only requirement for a controller is to return a ``Response`` object. The
 abstraction around the HTTP response - the text-based message filled with HTTP
 headers and content that's sent back to the client::
 
+    use Symfony\Component\HttpFoundation\Response;
+
     // create a simple Response with a 200 status code (the default)
     $response = new Response('Hello '.$name, 200);
 
diff --git a/book/forms.rst b/book/forms.rst
@@ -201,6 +201,7 @@ user must be bound to the form. Add the following functionality to your
 controller::
 
     // ...
+    use Symfony\Component\HttpFoundation\Request;
 
     public function newAction(Request $request)
     {
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -307,6 +307,8 @@ its creation more manageable::
 
     // ...
 
+    use Symfony\Component\HttpFoundation\Response;
+
     $response = new Response();
 
     // mark the response as either public or private
@@ -647,6 +649,8 @@ Put another way, the less you do in your application to return a 304 response,
 the better. The ``Response::isNotModified()`` method does exactly that by
 exposing a simple and efficient pattern::
 
+    use Symfony\Component\HttpFoundation\Response;
+
     public function showAction($articleSlug)
     {
         // Get the minimum information to compute
@@ -1008,6 +1012,8 @@ Here is how you can configure the Symfony2 reverse proxy to support the
 
     // ...
     use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+    use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\HttpFoundation\Response;
 
     class AppCache extends HttpCache
     {
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -363,6 +363,8 @@ need to check the incoming URI and execute different parts of your code dependin
 on that value. This can get ugly quickly::
 
     // index.php
+    use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\HttpFoundation\Response;
     $request = Request::createFromGlobals();
     $path = $request->getPathInfo(); // the URI path being requested
 
@@ -457,6 +459,8 @@ the ``AcmeDemoBundle:Main:contact`` string is a short syntax that points to a
 specific PHP method ``contactAction`` inside a class called ``MainController``::
 
     // src/Acme/DemoBundle/Controller/MainController.php
+    use Symfony\Component\HttpFoundation\Response;
+
     class MainController
     {
         public function contactAction()
diff --git a/book/templating.rst b/book/templating.rst
@@ -988,6 +988,8 @@ you're actually using the templating engine service. For example::
 
 is equivalent to::
 
+    use Symfony\Component\HttpFoundation\Response;
+
     $engine = $this->container->get('templating');
     $content = $engine->render('AcmeArticleBundle:Article:index.html.twig');
 
diff --git a/book/translation.rst b/book/translation.rst
@@ -95,6 +95,9 @@ of text (called a *message*), use the
 :method:`Symfony\\Component\\Translation\\Translator::trans` method. Suppose,
 for example, that you're translating a simple message from inside a controller::
 
+    // ...
+    use Symfony\Component\HttpFoundation\Response;
+
     public function indexAction()
     {
         $t = $this->get('translator')->trans('Symfony2 is great');
@@ -168,6 +171,9 @@ Message Placeholders
 
 Sometimes, a message containing a variable needs to be translated::
 
+    // ...
+    use Symfony\Component\HttpFoundation\Response;
+
     public function indexAction($name)
     {
         $t = $this->get('translator')->trans('Hello '.$name);
@@ -181,14 +187,17 @@ will try to look up the exact message, including the variable portions
 for every possible iteration of the ``$name`` variable, you can replace the
 variable with a "placeholder"::
 
+    // ...
+    use Symfony\Component\HttpFoundation\Response;
+
     public function indexAction($name)
     {
         $t = $this->get('translator')->trans(
             'Hello %name%',
             array('%name%' => $name)
         );
 
-        new Response($t);
+        return new Response($t);
     }
 
 Symfony2 will now look for a translation of the raw message (``Hello %name%``)

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,7 @@ user must be bound to the form. Add the following functionality to your`
`201`	`201`	`controller::`
`202`	`202`
`203`	`203`	`// ...`
	`204`	`+ use Symfony\Component\HttpFoundation\Request;`
`204`	`205`
`205`	`206`	`public function newAction(Request $request)`
`206`	`207`	`{`