[5.x] PHP 8.5 Compatibility

.github/workflows/tests.yml

@@ -19,6 +19,8 @@ jobs:
         php: [8.1, 8.2, 8.3, 8.4]
         laravel: [10, 11, 12]
         include:
+          - php: 8.5
+            laravel: 12
           - php: 8.2
             laravel: 9
           - php: 8.1

composer.json

@@ -27,9 +27,9 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
+        "orchestra/testbench": "^4.18|^5.20|^6.47|^7.55|^8.36|^9.15|^10.8",
         "phpstan/phpstan": "^1.12.23",
-        "phpunit/phpunit": "^8.0|^9.3|^10.4|^11.5"
+        "phpunit/phpunit": "^8.0|^9.3|^10.4|^11.5|^12.0"
     },
     "autoload": {
         "psr-4": {

tests/GoogleProviderIdTokenTest.php

@@ -8,6 +8,7 @@
 use Laravel\Socialite\Two\GoogleProvider;
 use Laravel\Socialite\Two\User;
 use Mockery as m;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
@@ -30,7 +31,10 @@ public function test_it_can_detect_jwt_tokens()
 
         $reflection = new \ReflectionClass($provider);
         $method = $reflection->getMethod('isJwtToken');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         $this->assertTrue($method->invoke($provider, $jwtToken));
         $this->assertFalse($method->invoke($provider, $accessToken));
@@ -99,6 +103,7 @@ public function test_it_falls_back_to_api_call_for_access_tokens()
     /**
      * @dataProvider invalidJwtProvider
      */
+    #[DataProvider('invalidJwtProvider')]
     public function test_it_handles_invalid_jwt_tokens($description, $tokenOverrides, $expectedException = true)
     {
         $provider = $this->getProvider();
@@ -145,7 +150,10 @@ public function test_user_mapping_works_with_id_token_format()
 
         $reflection = new \ReflectionClass($provider);
         $method = $reflection->getMethod('mapUserToObject');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         $user = $method->invoke($provider, $idTokenUser);