changed comparison on the request method to use the isMethod() method

fabpot · fabpot · commit 58cb6f55ccb3 · 2012-09-23T15:11:53.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -231,7 +231,7 @@ public function prepare(Request $request)
             $headers->remove('Content-Length');
         }
 
-        if ('HEAD' === $request->getMethod()) {
+        if ($request->isMethod('HEAD')) {
             // cf. RFC2616 14.13
             $length = $headers->get('Content-Length');
             $this->setContent(null);
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -580,7 +580,7 @@ protected function store(Request $request, Response $response)
      */
     private function restoreResponseBody(Request $request, Response $response)
     {
-        if ('HEAD' === $request->getMethod() || 304 === $response->getStatusCode()) {
+        if ($request->isMethod('HEAD') || 304 === $response->getStatusCode()) {
             $response->setContent(null);
             $response->headers->remove('X-Body-Eval');
             $response->headers->remove('X-Body-File');

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public function prepare(Request $request)`
`231`	`231`	`$headers->remove('Content-Length');`
`232`	`232`	`}`
`233`	`233`
`234`		`- if ('HEAD' === $request->getMethod()) {`
	`234`	`+ if ($request->isMethod('HEAD')) {`
`235`	`235`	`// cf. RFC2616 14.13`
`236`	`236`	`$length = $headers->get('Content-Length');`
`237`	`237`	`$this->setContent(null);`
Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ protected function store(Request $request, Response $response)`
`580`	`580`	`*/`
`581`	`581`	`private function restoreResponseBody(Request $request, Response $response)`
`582`	`582`	`{`
`583`		`- if ('HEAD' === $request->getMethod() \|\| 304 === $response->getStatusCode()) {`
	`583`	`+ if ($request->isMethod('HEAD') \|\| 304 === $response->getStatusCode()) {`
`584`	`584`	`$response->setContent(null);`
`585`	`585`	`$response->headers->remove('X-Body-Eval');`
`586`	`586`	`$response->headers->remove('X-Body-File');`