Merge branch '6.1' into 6.2

* 6.1:
  explicitly disable HTTP method overrides in tests

Author: xabbuh

Tests/DependencyInjection/ConfigurationTest.php

@@ -433,7 +433,10 @@ public function testLockCanBeDisabled()
         $configuration = new Configuration(true);
 
         $config = $processor->processConfiguration($configuration, [
-            ['lock' => ['enabled' => false]],
+            [
+                'http_method_override' => false,
+                'lock' => ['enabled' => false],
+            ],
         ]);
 
         $this->assertFalse($config['lock']['enabled']);
@@ -448,7 +451,10 @@ public function testEnabledLockNeedsResources()
         $this->expectExceptionMessage('Invalid configuration for path "framework.lock": At least one resource must be defined.');
 
         $processor->processConfiguration($configuration, [
-            ['lock' => ['enabled' => true]],
+            [
+                'http_method_override' => false,
+                'lock' => ['enabled' => true],
+            ],
         ]);
     }