From a36d3e19b9694747ffccc7044e916fcebde64579 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 18 Nov 2020 14:00:51 +0000 Subject: [PATCH 1/3] Set minimum Guzzle version for PHP 8 CI --- .github/workflows/tests.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4559e4bc8fd7..d9ef03c31026 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,6 +50,14 @@ jobs: - name: Setup problem matchers run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Set Minimum Guzzle Version + uses: nick-invision/retry@v1 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer require guzzle/guzzle:^7.2 --no-interaction --no-update + if: matrix.php >= 8 + - name: Install dependencies uses: nick-invision/retry@v1 with: @@ -94,6 +102,14 @@ jobs: - name: Setup problem matchers run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Set Minimum Guzzle Version + uses: nick-invision/retry@v1 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer require guzzle/guzzle:^7.2 --no-interaction --no-update + if: matrix.php >= 8 + - name: Install dependencies uses: nick-invision/retry@v1 with: From 86f98bb5a471a0f26d1d34369e25f0e8271b92fb Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 18 Nov 2020 14:04:03 +0000 Subject: [PATCH 2/3] Fixed typos --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d9ef03c31026..02cdf62a88dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,7 +55,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require guzzle/guzzle:^7.2 --no-interaction --no-update + command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update if: matrix.php >= 8 - name: Install dependencies @@ -107,7 +107,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require guzzle/guzzle:^7.2 --no-interaction --no-update + command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update if: matrix.php >= 8 - name: Install dependencies From 7202aa0f37c5143b5096de562ee7cd229688c62f Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 18 Nov 2020 14:11:09 +0000 Subject: [PATCH 3/3] Corrected min supported aws sdk --- composer.json | 4 ++-- src/Illuminate/Mail/composer.json | 2 +- src/Illuminate/Queue/composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 8a164cf352b1..e32e059170fe 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,7 @@ "tightenco/collect": "<5.5.33" }, "require-dev": { - "aws/aws-sdk-php": "^3.0", + "aws/aws-sdk-php": "^3.155", "doctrine/dbal": "^2.6", "filp/whoops": "^2.8", "guzzlehttp/guzzle": "^6.3.1|^7.0.1", @@ -119,7 +119,7 @@ "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", - "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "filp/whoops": "Required for friendly error pages in development (^2.8).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 7bff13f3beb9..dfe6100d24c7 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -35,7 +35,7 @@ } }, "suggest": { - "aws/aws-sdk-php": "Required to use the SES mail driver (^3.0).", + "aws/aws-sdk-php": "Required to use the SES mail driver (^3.155).", "guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^6.3.1|^7.0.1).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index b6e9238c3c0a..8e1616012c48 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -40,7 +40,7 @@ "suggest": { "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.0).", + "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.155).", "illuminate/redis": "Required to use the Redis queue driver (^6.0).", "pda/pheanstalk": "Required to use the Beanstalk queue driver (^4.0)." },