Fix tests with PHP 8.3

Resolves: thephpleague#1029
liayn · May 16, 2024 · 004b407 · 004b407
1 parent 2455200
commit 004b407
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -6,6 +6,7 @@
         "sort-packages": true
     },
     "require": {
+        "ext-json": "*",
         "php": "^5.6 || ^7.0 || ^8.0",
         "guzzlehttp/guzzle": "^6.0 || ^7.0",
         "paragonie/random_compat": "^1 || ^2 || ^9.99"

diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php
@@ -757,7 +757,7 @@ protected function parseJson($content)
      */
     protected function getContentType(ResponseInterface $response)
     {
-        return join(';', (array) $response->getHeader('content-type'));
+        return implode(';', $response->getHeader('content-type'));
     }
 
     /**

diff --git a/test/src/Grant/GrantTestCase.php b/test/src/Grant/GrantTestCase.php
@@ -65,7 +65,7 @@ public function testGetAccessToken($grant, array $params = [])
             ->shouldReceive('getHeader')
             ->once()
             ->with('content-type')
-            ->andReturn('application/json');
+            ->andReturn(['application/json']);
 
         /** @var ClientInterface & MockInterface $client */
         $client = Mockery::spy(ClientInterface::class)->makePartial();

diff --git a/test/src/Provider/AbstractProviderTest.php b/test/src/Provider/AbstractProviderTest.php
@@ -50,7 +50,7 @@ public function testInvalidGrantString()
     public function testInvalidGrantObject()
     {
         $this->expectException(InvalidGrantException::class);
-        $grant = new \StdClass();
+        $grant = new \stdClass();
         $this->getMockProvider()->getAccessToken($grant, ['invalid_parameter' => 'none']);
     }
 
@@ -213,7 +213,7 @@ public function testGetUserProperties($name = null, $email = null, $id = null)
             ->shouldReceive('getHeader')
             ->once()
             ->with('content-type')
-            ->andReturn('application/json');
+            ->andReturn(['application/json']);
 
 
         $client = Mockery::spy(ClientInterface::class, [
@@ -262,7 +262,7 @@ public function testGetUserPropertiesThrowsExceptionWhenNonJsonResponseIsReceive
         $response
             ->shouldReceive('getHeader')
             ->with('content-type')
-            ->andReturn('text/html');
+            ->andReturn(['text/html']);
 
         $client = Mockery::mock(ClientInterface::class, [
             'send' => $response,
@@ -378,7 +378,7 @@ public function testPkceMethod($pkceMethod, $pkceCode, $expectedChallenge)
             ->shouldReceive('getHeader')
             ->once()
             ->with('content-type')
-            ->andReturn('application/json');
+            ->andReturn(['application/json']);
 
         $client = Mockery::spy(ClientInterface::class, [
             'send' => $response,
@@ -474,7 +474,7 @@ public function testErrorResponsesCanBeCustomizedAtTheProvider()
             ->shouldReceive('getHeader')
             ->once()
             ->with('content-type')
-            ->andReturn('application/json');
+            ->andReturn(['application/json']);
 
         $client = Mockery::spy(ClientInterface::class, [
             'send' => $response,
@@ -532,7 +532,7 @@ public function testClientErrorTriggersProviderException()
         $response
             ->shouldReceive('getHeader')
             ->with('content-type')
-            ->andReturn('application/json');
+            ->andReturn(['application/json']);
 
         $client = Mockery::mock(ClientInterface::class);
         $client
@@ -579,7 +579,7 @@ public function testAuthenticatedRequestAndResponse()
         $response
             ->shouldReceive('getHeader')
             ->with('content-type')
-            ->andReturn('application/json');
+            ->andReturn(['application/json']);
 
         $client = Mockery::mock(ClientInterface::class);
         $client
@@ -647,7 +647,7 @@ public function testGetAccessToken($method)
             ->shouldReceive('getHeader')
             ->once()
             ->with('content-type')
-            ->andReturn('application/json');
+            ->andReturn(['application/json']);
 
         $client = Mockery::spy(ClientInterface::class, [
             'send' => $response,
@@ -686,7 +686,7 @@ public function testGetAccessTokenWithNonJsonResponse()
         $response
             ->shouldReceive('getHeader')
             ->with('content-type')
-            ->andReturn('text/plain');
+            ->andReturn(['text/plain']);
 
         $client = Mockery::mock(ClientInterface::class, [
             'send' => $response,
@@ -745,7 +745,7 @@ public function testParseResponse($body, $type, $parsed, $statusCode = 200)
         $response
             ->shouldReceive('getHeader')
             ->with('content-type')
-            ->andReturn($type);
+            ->andReturn([$type]);
 
         $method = $this->getMethod(AbstractProvider::class, 'parseResponse');
         $result = $method->invoke($this->getMockProvider(), $response);