From 5dc75923f11042bca5b3cb6a16c82f3d104002cd Mon Sep 17 00:00:00 2001 From: Sadika Sumanapala Date: Sun, 4 Oct 2020 23:36:41 +0530 Subject: [PATCH] Allow both guzzle 6.x and 7.x fixes #248 fixes #253 --- azure-storage-common/composer.json | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-storage-common/composer.json b/azure-storage-common/composer.json index 3e94b8dfc..8afe15c52 100644 --- a/azure-storage-common/composer.json +++ b/azure-storage-common/composer.json @@ -12,11 +12,11 @@ ], "require": { "php": ">=5.6.0", - "guzzlehttp/guzzle": "~6.0" + "guzzlehttp/guzzle": "~6.0|^7.0" }, "autoload": { "psr-4": { "MicrosoftAzure\\Storage\\Common\\": "src/Common" } } -} \ No newline at end of file +} diff --git a/composer.json b/composer.json index 7fe9f0f20..40787aae9 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": ">=5.6.0", - "guzzlehttp/guzzle": "~6.0" + "guzzlehttp/guzzle": "~6.0|^7.0" }, "require-dev": { "phpunit/phpunit": "~4.8.35",