Merge branch '3.1' into 3.2

* 3.1:
  [HttpFoundation] Fix test ensuring isMethodSafe() checks cacheable

Author: fabpot

Tests/RequestTest.php

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