feat: Upgrade Guzzlehttp/psr7 version (#4508)

* Changed the uses of deprecated functions from GuzzleHttp/Psr7 to alternate methods * Changed the use of Psr7\stream_for() to Utils::streamFor in a missed Storage file * Bumped dependency versions of guzzlehttp/psr7, google/auth and google/gax * Bumped psr7 dependency in Core/ * Updated dependencies in Core and the the packages using Psr7 from google/cloud-core * Updated dependency of google/cloud-core in Vision
googleapis · Sep 14, 2021 · 1062b46 · 1062b46
1 parent 5747ef8
commit 1062b46
Show file tree

Hide file tree

Showing 45 changed files with 79 additions and 94 deletions.
diff --git a/BigQuery/composer.json b/BigQuery/composer.json
@@ -4,7 +4,7 @@
     "license": "Apache-2.0",
     "minimum-stability": "stable",
     "require": {
-        "google/cloud-core": "^1.39",
+        "google/cloud-core": "^1.43",
         "ramsey/uuid": "^3.0|^4.0"
     },
     "require-dev": {

diff --git a/BigQuery/src/Bytes.php b/BigQuery/src/Bytes.php
@@ -17,7 +17,7 @@
 
 namespace Google\Cloud\BigQuery;
 
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -45,7 +45,7 @@ class Bytes implements ValueInterface
      */
     public function __construct($value)
     {
-        $this->value = Psr7\stream_for($value);
+        $this->value = Utils::streamFor($value);
     }
 
     /**

diff --git a/BigQuery/src/Connection/Rest.php b/BigQuery/src/Connection/Rest.php
@@ -25,7 +25,7 @@
 use Google\Cloud\Core\Upload\AbstractUploader;
 use Google\Cloud\Core\Upload\MultipartUploader;
 use Google\Cloud\Core\UriTrait;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 
 /**
  * Implementation of the
@@ -280,7 +280,7 @@ private function resolveUploadOptions(array $args)
             'jobReference' => []
         ];
 
-        $args['data'] = Psr7\stream_for($args['data']);
+        $args['data'] = Utils::streamFor($args['data']);
         $args['metadata'] = $this->pluckArray([
             'labels',
             'dryRun',

diff --git a/BigQuery/tests/System/LoadDataAndQueryTest.php b/BigQuery/tests/System/LoadDataAndQueryTest.php
@@ -21,7 +21,7 @@
 use Google\Cloud\BigQuery\Geography;
 use Google\Cloud\BigQuery\Numeric;
 use Google\Cloud\Core\ExponentialBackoff;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 
 /**
  * @group bigquery
@@ -408,7 +408,7 @@ public function rowProvider()
         return [
             [$data],
             [fopen(__DIR__ . '/data/table-data.json', 'r')],
-            [Psr7\stream_for($data)]
+            [Utils::streamFor($data)]
         ];
     }
 

diff --git a/BigQuery/tests/Unit/BytesTest.php b/BigQuery/tests/Unit/BytesTest.php
@@ -18,7 +18,7 @@
 namespace Google\Cloud\BigQuery\Tests\Unit;
 
 use Google\Cloud\BigQuery\Bytes;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -47,7 +47,7 @@ public function valueProvider()
         return [
             [$this->value],
             [$fh],
-            [Psr7\stream_for($this->value)]
+            [Utils::streamFor($this->value)]
         ];
     }
 

diff --git a/BigQuery/tests/Unit/Connection/RestTest.php b/BigQuery/tests/Unit/Connection/RestTest.php
@@ -22,7 +22,6 @@
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Core\Upload\AbstractUploader;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;

diff --git a/Core/composer.json b/Core/composer.json
@@ -6,10 +6,10 @@
     "require": {
         "php": ">=5.5",
         "rize/uri-template": "~0.3",
-        "google/auth": "^1.12",
+        "google/auth": "^1.18",
         "guzzlehttp/guzzle": "^5.3|^6.0|^7.0",
         "guzzlehttp/promises": "^1.3",
-        "guzzlehttp/psr7": "^1.2",
+        "guzzlehttp/psr7": "^1.7|^2.0",
         "monolog/monolog": "^1.1|^2.0",
         "psr/http-message": "1.0.*"
     },
@@ -18,7 +18,7 @@
         "squizlabs/php_codesniffer": "2.*",
         "phpdocumentor/reflection": "^3.0",
         "erusev/parsedown": "^1.6",
-        "google/gax": "^1.1",
+        "google/gax": "^1.9",
         "opis/closure": "^3",
         "google/common-protos": "^1.0"
     },

diff --git a/Core/src/Blob.php b/Core/src/Blob.php
@@ -17,7 +17,7 @@
 
 namespace Google\Cloud\Core;
 
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -52,7 +52,7 @@ class Blob
      */
     public function __construct($value)
     {
-        $this->value = Psr7\stream_for($value);
+        $this->value = Utils::streamFor($value);
     }
 
     /**

diff --git a/Core/src/RequestBuilder.php b/Core/src/RequestBuilder.php
@@ -17,7 +17,6 @@
 
 namespace Google\Cloud\Core;
 
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\RequestInterface;

diff --git a/Core/src/RequestWrapper.php b/Core/src/RequestWrapper.php
@@ -25,7 +25,7 @@
 use Google\Cloud\Core\RequestWrapperTrait;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
@@ -304,7 +304,7 @@ private function applyHeaders(RequestInterface $request)
             }
         }
 
-        return Psr7\modify_request($request, ['set_headers' => $headers]);
+        return Utils::modifyRequest($request, ['set_headers' => $headers]);
     }
 
     /**

diff --git a/Core/src/Upload/AbstractUploader.php b/Core/src/Upload/AbstractUploader.php
@@ -19,7 +19,7 @@
 
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\UriTrait;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -96,7 +96,7 @@ public function __construct(
         array $options = []
     ) {
         $this->requestWrapper = $requestWrapper;
-        $this->data = Psr7\stream_for($data);
+        $this->data = Utils::streamFor($data);
         $this->uri = $uri;
         $this->metadata = isset($options['metadata']) ? $options['metadata'] : [];
         $this->chunkSize = isset($options['chunkSize']) ? $options['chunkSize'] : null;

diff --git a/Core/src/Upload/ResumableUploader.php b/Core/src/Upload/ResumableUploader.php
@@ -23,7 +23,6 @@
 use Google\Cloud\Core\JsonTrait;
 use Google\Cloud\Core\RequestWrapper;
 use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\LimitStream;
 use GuzzleHttp\Psr7\Request;
 use Psr\Http\Message\ResponseInterface;

diff --git a/Core/src/UriTrait.php b/Core/src/UriTrait.php
@@ -17,7 +17,8 @@
 
 namespace Google\Cloud\Core;
 
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Query;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\UriInterface;
 use Rize\UriTemplate;
 
@@ -59,6 +60,6 @@ public function buildUriWithQuery($uri, array $query)
             }
         }
 
-        return Psr7\uri_for($uri)->withQuery(Psr7\build_query($query));
+        return Utils::uriFor($uri)->withQuery(Query::build($query));
     }
 }
diff --git a/Core/tests/Unit/Upload/MultipartUploaderTest.php b/Core/tests/Unit/Upload/MultipartUploaderTest.php
@@ -20,14 +20,13 @@
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Upload\MultipartUploader;
 use GuzzleHttp\Psr7;
-use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Psr7\Utils;
 use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use PHPUnit\Framework\TestCase;
-use Psr\Http\Message\StreamInterface;
 
 /**
  * @group core
@@ -38,7 +37,7 @@ class MultipartUploaderTest extends TestCase
     public function testUploadsData()
     {
         $requestWrapper = $this->prophesize(RequestWrapper::class);
-        $stream = Psr7\stream_for('abcd');
+        $stream = Utils::streamFor('abcd');
         $successBody = '{"canI":"kickIt"}';
         $response = new Response(200, [], $successBody);
 
@@ -59,7 +58,7 @@ public function testUploadsData()
     public function testUploadsAsyncData()
     {
         $requestWrapper = $this->prophesize(RequestWrapper::class);
-        $stream = Psr7\stream_for('abcd');
+        $stream = Utils::streamFor('abcd');
         $successBody = '{"canI":"kickIt"}';
         $response = new Response(200, [], $successBody);
         $promise = Promise\promise_for($response);

diff --git a/Core/tests/Unit/Upload/ResumableUploaderTest.php b/Core/tests/Unit/Upload/ResumableUploaderTest.php
@@ -20,9 +20,8 @@
 use Google\Cloud\Core\Exception\GoogleException;
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Upload\ResumableUploader;
-use GuzzleHttp\Psr7;
-use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
@@ -41,7 +40,7 @@ class ResumableUploaderTest extends TestCase
     public function setUp()
     {
         $this->requestWrapper = $this->prophesize(RequestWrapper::class);
-        $this->stream = Psr7\stream_for('abcd');
+        $this->stream = Utils::streamFor('abcd');
         $this->successBody = '{"canI":"kickIt"}';
     }
 

diff --git a/Core/tests/Unit/Upload/SignedUrlUploaderTest.php b/Core/tests/Unit/Upload/SignedUrlUploaderTest.php
@@ -20,12 +20,11 @@
 use Google\Cloud\Core\Exception\GoogleException;
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Upload\SignedUrlUploader;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamInterface;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -41,7 +40,7 @@ class SignedUrlUploaderTest extends TestCase
     public function setUp()
     {
         $this->requestWrapper = $this->prophesize(RequestWrapper::class);
-        $this->stream = Psr7\stream_for('abcd');
+        $this->stream = Utils::streamFor('abcd');
         $this->successBody = '{"canI":"kickIt"}';
     }
 

diff --git a/Datastore/composer.json b/Datastore/composer.json
@@ -4,7 +4,7 @@
     "license": "Apache-2.0",
     "minimum-stability": "stable",
     "require": {
-        "google/cloud-core": "^1.39",
+        "google/cloud-core": "^1.43",
         "google/gax": "^1.1"
     },
     "require-dev": {

diff --git a/Datastore/src/Blob.php b/Datastore/src/Blob.php
@@ -18,8 +18,6 @@
 namespace Google\Cloud\Datastore;
 
 use Google\Cloud\Core\Blob as CoreBlob;
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\StreamInterface;
 
 /**
  * Represents a Blob value.

diff --git a/Datastore/tests/Unit/BlobTest.php b/Datastore/tests/Unit/BlobTest.php
@@ -18,7 +18,7 @@
 namespace Google\Cloud\Datastore\Tests\Unit;
 
 use Google\Cloud\Datastore\Blob;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -45,7 +45,7 @@ public function testBlobResource()
 
     public function testBlobStreamInterface()
     {
-        $blob = new Blob(Psr7\stream_for('hello world'));
+        $blob = new Blob(Utils::streamFor('hello world'));
         $this->assertEquals('hello world', (string) $blob);
     }
 

diff --git a/Datastore/tests/Unit/Connection/RestTest.php b/Datastore/tests/Unit/Connection/RestTest.php
@@ -21,7 +21,6 @@
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Datastore\Connection\Rest;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;

diff --git a/Datastore/tests/Unit/EntityTest.php b/Datastore/tests/Unit/EntityTest.php
@@ -20,7 +20,6 @@
 use Google\Cloud\Datastore\Entity;
 use Google\Cloud\Datastore\EntityMapper;
 use Google\Cloud\Datastore\Key;
-use GuzzleHttp\Psr7\Stream;
 use PHPUnit\Framework\TestCase;
 
 /**

diff --git a/Language/tests/Unit/Connection/RestTest.php b/Language/tests/Unit/Connection/RestTest.php
@@ -21,7 +21,6 @@
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Language\Connection\Rest;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;

diff --git a/Logging/tests/Unit/Connection/RestTest.php b/Logging/tests/Unit/Connection/RestTest.php
@@ -21,7 +21,6 @@
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Logging\Connection\Rest;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;

diff --git a/PubSub/tests/Unit/Connection/RestTest.php b/PubSub/tests/Unit/Connection/RestTest.php
@@ -21,7 +21,6 @@
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\PubSub\Connection\Rest;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;

diff --git a/Spanner/composer.json b/Spanner/composer.json
@@ -5,7 +5,7 @@
     "minimum-stability": "stable",
     "require": {
         "ext-grpc": "*",
-        "google/cloud-core": "^1.39",
+        "google/cloud-core": "^1.43",
         "google/gax": "^1.1"
     },
     "require-dev": {

diff --git a/Spanner/src/Bytes.php b/Spanner/src/Bytes.php
@@ -17,7 +17,7 @@
 
 namespace Google\Cloud\Spanner;
 
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -50,7 +50,7 @@ class Bytes implements ValueInterface
      */
     public function __construct($value)
     {
-        $this->value = Psr7\stream_for($value);
+        $this->value = Utils::streamFor($value);
     }
 
     /**

diff --git a/Speech/tests/Unit/Connection/RestTest.php b/Speech/tests/Unit/Connection/RestTest.php
@@ -21,7 +21,6 @@
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\Testing\TestHelpers;
 use Google\Cloud\Speech\Connection\Rest;
-use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;

diff --git a/Storage/composer.json b/Storage/composer.json
@@ -4,7 +4,7 @@
     "license": "Apache-2.0",
     "minimum-stability": "stable",
     "require": {
-        "google/cloud-core": "^1.39",
+        "google/cloud-core": "^1.43",
         "google/crc32": "^0.1.0"
     },
     "require-dev": {