Merge branch '6.4' into 7.1

* 6.4:
  Make more data providers static
  fix merge
  Mutate remaining data providers to static ones

Author: derrabus

Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

@@ -98,7 +98,7 @@ public function testConstructorShouldThrowExceptionForMissingOptions(array $opti
         new MongoDbSessionHandler($this->manager, $options);
     }
 
-    public function provideInvalidOptions()
+    public static function provideInvalidOptions(): iterable
     {
         yield 'empty' => [[]];
         yield 'collection missing' => [['database' => 'foo']];

Tests/Test/Constraint/ResponseHeaderLocationSameTest.php

@@ -36,7 +36,7 @@ public function testConstraintSuccess(string $requestUrl, ?string $location, str
         self::assertTrue($constraint->evaluate($response, '', true));
     }
 
-    public function provideSuccessCases(): iterable
+    public static function provideSuccessCases(): iterable
     {
         yield ['http://example.com', 'http://example.com', 'http://example.com'];
         yield ['http://example.com', 'http://example.com', '//example.com'];
@@ -112,7 +112,7 @@ public function testConstraintFailure(string $requestUrl, ?string $location, str
         $constraint->evaluate($response);
     }
 
-    public function provideFailureCases(): iterable
+    public static function provideFailureCases(): iterable
     {
         yield ['http://example.com', null, 'http://example.com'];
         yield ['http://example.com', null, '//example.com'];