Merge branch '3.1' into 3.2

* 3.1:
  [HttpFoundation] Fix test ensuring isMethodSafe() checks cacheable
This commit is contained in:
Fabien Potencier 2016-11-26 20:21:38 -08:00
commit a8c279d7a8

View File

@ -2020,7 +2020,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
public function testMethodSafeChecksCacheable() public function testMethodSafeChecksCacheable()
{ {
$request = new Request(); $request = new Request();
$request->setMethod('OPTION'); $request->setMethod('OPTIONS');
$this->assertFalse($request->isMethodSafe()); $this->assertFalse($request->isMethodSafe());
} }