Merge branch '6.4' into 7.1

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

Tests/Authenticator/AccessTokenAuthenticatorTest.php

@@ -177,7 +177,7 @@ public function testAccessTokenHeaderRegex(string $input, ?string $expectedToken
         $this->assertEquals($expectedToken, $token);
     }
 
-    public function provideAccessTokenHeaderRegex(): array
+    public static function provideAccessTokenHeaderRegex(): array
     {
         return [
             ['Bearer token', 'token'],