Skip to content

Commit e90889d

Browse files
[6.x] Set minimum Guzzle version for PHP 8 CI (#35267)
* Set minimum Guzzle version for PHP 8 CI * Fixed typos * Corrected min supported aws sdk
1 parent 53d66bb commit e90889d

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

.github/workflows/tests.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ jobs:
5050
- name: Setup problem matchers
5151
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
5252

53+
- name: Set Minimum Guzzle Version
54+
uses: nick-invision/retry@v1
55+
with:
56+
timeout_minutes: 5
57+
max_attempts: 5
58+
command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update
59+
if: matrix.php >= 8
60+
5361
- name: Install dependencies
5462
uses: nick-invision/retry@v1
5563
with:
@@ -94,6 +102,14 @@ jobs:
94102
- name: Setup problem matchers
95103
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
96104

105+
- name: Set Minimum Guzzle Version
106+
uses: nick-invision/retry@v1
107+
with:
108+
timeout_minutes: 5
109+
max_attempts: 5
110+
command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update
111+
if: matrix.php >= 8
112+
97113
- name: Install dependencies
98114
uses: nick-invision/retry@v1
99115
with:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"tightenco/collect": "<5.5.33"
7878
},
7979
"require-dev": {
80-
"aws/aws-sdk-php": "^3.0",
80+
"aws/aws-sdk-php": "^3.155",
8181
"doctrine/dbal": "^2.6",
8282
"filp/whoops": "^2.8",
8383
"guzzlehttp/guzzle": "^6.3.1|^7.0.1",
@@ -119,7 +119,7 @@
119119
"ext-pcntl": "Required to use all features of the queue worker.",
120120
"ext-posix": "Required to use all features of the queue worker.",
121121
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
122-
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
122+
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).",
123123
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
124124
"filp/whoops": "Required for friendly error pages in development (^2.8).",
125125
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",

src/Illuminate/Mail/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636
},
3737
"suggest": {
38-
"aws/aws-sdk-php": "Required to use the SES mail driver (^3.0).",
38+
"aws/aws-sdk-php": "Required to use the SES mail driver (^3.155).",
3939
"guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^6.3.1|^7.0.1).",
4040
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
4141
},

src/Illuminate/Queue/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"suggest": {
4141
"ext-pcntl": "Required to use all features of the queue worker.",
4242
"ext-posix": "Required to use all features of the queue worker.",
43-
"aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.0).",
43+
"aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.155).",
4444
"illuminate/redis": "Required to use the Redis queue driver (^6.0).",
4545
"pda/pheanstalk": "Required to use the Beanstalk queue driver (^4.0)."
4646
},

0 commit comments

Comments
 (0)