Merge branch '2.8' into 3.1

fabpot · fabpot · commit 401396ac127d · 2016-11-26T20:21:07.000-08:00
* 2.8:
  [HttpFoundation] Fix test ensuring isMethodSafe() checks cacheable
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1990,7 +1990,7 @@ public function methodSafeProvider()
     public function testMethodSafeChecksCacheable()
     {
         $request = new Request();
-        $request->setMethod('OPTION');
+        $request->setMethod('OPTIONS');
         $this->assertFalse($request->isMethodSafe());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1990,7 +1990,7 @@ public function methodSafeProvider()`
`1990`	`1990`	`public function testMethodSafeChecksCacheable()`
`1991`	`1991`	`{`
`1992`	`1992`	`$request = new Request();`
`1993`		`- $request->setMethod('OPTION');`
	`1993`	`+ $request->setMethod('OPTIONS');`
`1994`	`1994`	`$this->assertFalse($request->isMethodSafe());`
`1995`	`1995`	`}`
`1996`	`1996`