Fix merge

nicolas-grekas · nicolas-grekas · commit 1df5e7fb9aa5 · 2016-11-24T11:42:22.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -2013,13 +2013,6 @@ public function methodSafeProvider()
         );
     }
 
-    public function testMethodSafeChecksCacheable()
-    {
-        $request = new Request();
-        $request->setMethod('OPTION');
-        $this->assertFalse($request->isMethodSafe());
-    }
-
     /**
      * @group legacy
      * @expectedDeprecation Checking only for cacheable HTTP methods with Symfony\Component\HttpFoundation\Request::isMethodSafe() is deprecated since version 3.2 and will throw an exception in 4.0. Disable checking only for cacheable methods by calling the method with `false` as first argument or use the Request::isMethodCacheable() instead.
