Merge branch '2.3' into 2.7

xabbuh · xabbuh · commit e7f7391bca2c · 2015-10-09T10:04:21.000+02:00
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -912,7 +912,7 @@ Here is how you can configure the Symfony reverse proxy to support the
             if ('127.0.0.1' !== $request->getClientIp()) {
                 return new Response(
                     'Invalid HTTP method',
-                    Response::HTTP_BAD_REQUEST
+                    400
                 );
             }
 
diff --git a/book/testing.rst b/book/testing.rst
@@ -277,7 +277,7 @@ document::
         $this->assertTrue($client->getResponse()->isNotFound());
         // Assert a specific 200 status code
         $this->assertEquals(
-            200, // or Symfony\Component\HttpFoundation\Response::HTTP_OK
+            200,
             $client->getResponse()->getStatusCode()
         );
 

Original file line number	Diff line number	Diff line change
`@@ -912,7 +912,7 @@ Here is how you can configure the Symfony reverse proxy to support the`
`912`	`912`	`if ('127.0.0.1' !== $request->getClientIp()) {`
`913`	`913`	`return new Response(`
`914`	`914`	`'Invalid HTTP method',`
`915`		`- Response::HTTP_BAD_REQUEST`
	`915`	`+ 400`
`916`	`916`	`);`
`917`	`917`	`}`
`918`	`918`