From 6d145f54832ea5e7d1c8c488149c9d39c38dd56d Mon Sep 17 00:00:00 2001
From: Jeroen Thora <jeroenthora@gmail.com>
Date: Mon, 23 Sep 2024 20:41:57 +0200
Subject: [PATCH] Fix upstream deprecation warnings

---
 .github/workflows/ci.yml                                   | 2 ++
 composer.json                                              | 2 +-
 test/Github/Tests/Api/AbstractApiTest.php                  | 3 ++-
 test/Github/Tests/Functional/CacheTest.php                 | 3 ++-
 .../Tests/HttpClient/Message/ResponseMediatorTest.php      | 7 ++++---
 test/Github/Tests/Mock/PaginatedResponse.php               | 7 ++++---
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f94223ba096..9c46d891719 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,8 @@ jobs:
 
             - name: Run phpunit
               run: vendor/bin/phpunit --verbose
+              env:
+                  SYMFONY_DEPRECATIONS_HELPER: 'max[self]=0'
 
     phpstan:
         name: PHPStan
diff --git a/composer.json b/composer.json
index f3d598d6940..c1da1aefbca 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
     },
     "require-dev": {
         "symfony/cache": "^5.1.8",
-        "guzzlehttp/psr7": "^1.7",
+        "guzzlehttp/psr7": "^2.7",
         "http-interop/http-factory-guzzle": "^1.0",
         "guzzlehttp/guzzle": "^7.2",
         "php-http/mock-client": "^1.4.1",
diff --git a/test/Github/Tests/Api/AbstractApiTest.php b/test/Github/Tests/Api/AbstractApiTest.php
index 428ece12cf3..53e0eb6970a 100644
--- a/test/Github/Tests/Api/AbstractApiTest.php
+++ b/test/Github/Tests/Api/AbstractApiTest.php
@@ -4,6 +4,7 @@
 
 use Github\Api\AbstractApi;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 use Http\Client\Common\HttpMethodsClientInterface;
 
 class AbstractApiTest extends TestCase
@@ -232,7 +233,7 @@ private function getPSR7Response($expectedArray)
         return new Response(
             200,
             ['Content-Type' => 'application/json'],
-            \GuzzleHttp\Psr7\stream_for(json_encode($expectedArray))
+            Utils::streamFor(json_encode($expectedArray))
         );
     }
 }
diff --git a/test/Github/Tests/Functional/CacheTest.php b/test/Github/Tests/Functional/CacheTest.php
index eef379e61d5..bd217dc5dc2 100644
--- a/test/Github/Tests/Functional/CacheTest.php
+++ b/test/Github/Tests/Functional/CacheTest.php
@@ -5,6 +5,7 @@
 use Github\AuthMethod;
 use Github\Client;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
 /**
@@ -61,7 +62,7 @@ private function getCurrentUserResponse($username)
             'Content-Type' => 'application/json',
         ];
 
-        $body = \GuzzleHttp\Psr7\stream_for(json_encode([
+        $body = Utils::streamFor(json_encode([
             'login' => $username,
         ]));
 
diff --git a/test/Github/Tests/HttpClient/Message/ResponseMediatorTest.php b/test/Github/Tests/HttpClient/Message/ResponseMediatorTest.php
index 5171ab0bac8..b6216d57044 100644
--- a/test/Github/Tests/HttpClient/Message/ResponseMediatorTest.php
+++ b/test/Github/Tests/HttpClient/Message/ResponseMediatorTest.php
@@ -4,6 +4,7 @@
 
 use Github\HttpClient\Message\ResponseMediator;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -16,7 +17,7 @@ public function testGetContent()
         $response = new Response(
             200,
             ['Content-Type' => 'application/json'],
-            \GuzzleHttp\Psr7\stream_for(json_encode($body))
+            Utils::streamFor(json_encode($body))
         );
 
         $this->assertEquals($body, ResponseMediator::getContent($response));
@@ -31,7 +32,7 @@ public function testGetContentNotJson()
         $response = new Response(
             200,
             [],
-            \GuzzleHttp\Psr7\stream_for($body)
+            Utils::streamFor($body)
         );
 
         $this->assertEquals($body, ResponseMediator::getContent($response));
@@ -46,7 +47,7 @@ public function testGetContentInvalidJson()
         $response = new Response(
             200,
             ['Content-Type' => 'application/json'],
-            \GuzzleHttp\Psr7\stream_for($body)
+            Utils::streamFor($body)
         );
 
         $this->assertEquals($body, ResponseMediator::getContent($response));
diff --git a/test/Github/Tests/Mock/PaginatedResponse.php b/test/Github/Tests/Mock/PaginatedResponse.php
index 9d67b9f42be..296adf86457 100644
--- a/test/Github/Tests/Mock/PaginatedResponse.php
+++ b/test/Github/Tests/Mock/PaginatedResponse.php
@@ -3,6 +3,7 @@
 namespace Github\Tests\Mock;
 
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -18,10 +19,10 @@ public function __construct($loopCount, array $content = [])
         $this->loopCount = $loopCount;
         $this->content = $content;
 
-        parent::__construct(200, ['Content-Type' => 'application/json'], \GuzzleHttp\Psr7\stream_for(json_encode($content)));
+        parent::__construct(200, ['Content-Type' => 'application/json'], Utils::streamFor(json_encode($content)));
     }
 
-    public function getHeader($header)
+    public function getHeader($header): array
     {
         if ($header === 'Link') {
             if ($this->loopCount > 1) {
@@ -38,7 +39,7 @@ public function getHeader($header)
         return parent::getHeader($header);
     }
 
-    public function hasHeader($header)
+    public function hasHeader($header): bool
     {
         if ($header === 'Link') {
             return true;