Fix Guzzle compatibility issues

GrahamCampbell · web-flow · commit e5d878ceb837 · 2023-05-23T15:28:37.000+03:00
diff --git a/composer.json b/composer.json
@@ -26,7 +26,9 @@
   "require": {
     "php": ">=5.6.0",
     "cloudinary/transformation-builder-sdk":  "^1",
-    "guzzlehttp/guzzle": "^6|^7",
+    "guzzlehttp/guzzle": "^6.5.8|^7.4.5",
+    "guzzlehttp/promises": "^1.5.3|^2.0",
+    "guzzlehttp/psr7": "^1.9.1|^2.5",
     "teapot/status-code": "^1|^2",
     "ext-json": "*",
     "monolog/monolog": "^1|^2|^3",
diff --git a/src/Api/ApiClient.php b/src/Api/ApiClient.php
@@ -20,7 +20,7 @@
 use Cloudinary\Utils;
 use Exception;
 use GuzzleHttp\Client;
-use GuzzleHttp\Promise;
+use GuzzleHttp\Promise\Create;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7\LimitStream;
 use InvalidArgumentException;
@@ -355,13 +355,13 @@ private function postLargeFileAsync($endPoint, $fileHandle, $parameters, $option
                     ]
                 );
 
-                return Promise\rejection_for($e);
+                return Create::rejectionFor($e);
             }
 
             ArrayUtils::addNonEmptyFromOther($parameters, 'public_id', $uploadResult);
         }
 
-        return Promise\promise_for($uploadResult);
+        return Create::promiseFor($uploadResult);
     }
 
     /**
diff --git a/src/Api/BaseApiClient.php b/src/Api/BaseApiClient.php
@@ -28,7 +28,7 @@
 use Exception;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Promise;
+use GuzzleHttp\Promise\Create;
 use GuzzleHttp\Promise\PromiseInterface;
 use InvalidArgumentException;
 use JsonSerializable;
@@ -330,7 +330,7 @@ function (ResponseInterface $response) {
                         ['statusCode' => $response->getStatusCode()]
                     );
                     try {
-                        return Promise\promise_for($this->handleApiResponse($response));
+                        return Create::promiseFor($this->handleApiResponse($response));
                     } catch (Exception $e) {
                         $this->getLogger()->critical(
                             'Async request failed',
@@ -340,7 +340,7 @@ function (ResponseInterface $response) {
                             ]
                         );
 
-                        return Promise\rejection_for($e);
+                        return Create::rejectionFor($e);
                     }
                 },
                 function (Exception $error) {
@@ -352,10 +352,10 @@ function (Exception $error) {
                         ]
                     );
                     if ($error instanceof ClientException) {
-                        return Promise\rejection_for($this->handleApiResponse($error->getResponse()));
+                        return Create::rejectionFor($this->handleApiResponse($error->getResponse()));
                     }
 
-                    return Promise\rejection_for($error);
+                    return Create::rejectionFor($error);
                 }
             );
     }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use Cloudinary\Utils;`
`21`	`21`	`use Exception;`
`22`	`22`	`use GuzzleHttp\Client;`
`23`		`-use GuzzleHttp\Promise;`
	`23`	`+use GuzzleHttp\Promise\Create;`
`24`	`24`	`use GuzzleHttp\Promise\PromiseInterface;`
`25`	`25`	`use GuzzleHttp\Psr7\LimitStream;`
`26`	`26`	`use InvalidArgumentException;`
`@@ -355,13 +355,13 @@ private function postLargeFileAsync($endPoint, $fileHandle, $parameters, $option`
`355`	`355`	`]`
`356`	`356`	`);`
`357`	`357`
`358`		`- return Promise\rejection_for($e);`
	`358`	`+ return Create::rejectionFor($e);`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`ArrayUtils::addNonEmptyFromOther($parameters, 'public_id', $uploadResult);`
`362`	`362`	`}`
`363`	`363`
`364`		`- return Promise\promise_for($uploadResult);`
	`364`	`+ return Create::promiseFor($uploadResult);`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`/**`