Skip to content

Commit 4268aec

Browse files
authored
Add support for Guzzle v6 (#58)
* Add support for Guzzle ^6.3 * Add Guzzle versions to test matrix * Update test title names
1 parent 49570ca commit 4268aec

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/workflows/tests.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Tests
22

3-
on: [ push, pull_request ]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
pull_request:
9+
types: [ opened, synchronize, reopened ]
410

511
jobs:
612
test:
@@ -11,6 +17,7 @@ jobs:
1117
matrix:
1218
php: [ 7.2, 7.3, 7.4, 8.0 ]
1319
laravel: [ 7.*, 8.*, 9.* ]
20+
guzzle: [ 6.*, 7.* ]
1421
dependency-version: [ prefer-lowest, prefer-stable ]
1522
include:
1623
- laravel: 7.*
@@ -39,7 +46,11 @@ jobs:
3946
- laravel: 9.*
4047
php: 7.4
4148

42-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
49+
# Laravel 9 requires Guzzle ^7.2
50+
- laravel: 9.*
51+
guzzle: 6.*
52+
53+
name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
4354

4455
steps:
4556
- name: Checkout code
@@ -61,7 +72,7 @@ jobs:
6172
- name: Install dependencies
6273
run: |
6374
composer self-update ${{ matrix.composer-version }}
64-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
75+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "guzzlehttp/guzzle:${{ matrix.guzzle }}" --no-interaction --no-update
6576
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
6677
6778
- name: Execute tests

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"illuminate/filesystem": "^7.0|^8.0|^9.0",
1616
"illuminate/console": "^7.0|^8.0|^9.0",
1717
"maennchen/zipstream-php": "^2.1",
18-
"guzzlehttp/guzzle": "^7.2",
18+
"guzzlehttp/guzzle": "^6.3|^7.2",
1919
"aws/aws-sdk-php": "^3.20.0"
2020
},
2121
"require-dev": {

0 commit comments

Comments
 (0)