From 4268aec7df1e1b2b7d7e7fae945635f03a100d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilsen=20Hern=C3=A1ndez?=
 <13445515+wilsenhc@users.noreply.github.com>
Date: Thu, 31 Mar 2022 17:15:26 -0400
Subject: [PATCH] Add support for Guzzle v6 (#58)

* Add support for Guzzle ^6.3
* Add Guzzle versions to test matrix
* Update test title names
---
 .github/workflows/tests.yml | 17 ++++++++++++++---
 composer.json               |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9548a36..9369988 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,6 +1,12 @@
 name: Tests
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+    types: [ opened, synchronize, reopened ]
 
 jobs:
   test:
@@ -11,6 +17,7 @@ jobs:
       matrix:
         php: [ 7.2, 7.3, 7.4, 8.0 ]
         laravel: [ 7.*, 8.*, 9.* ]
+        guzzle: [ 6.*, 7.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
           - laravel: 7.*
@@ -39,7 +46,11 @@ jobs:
           - laravel: 9.*
             php: 7.4
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+            # Laravel 9 requires Guzzle ^7.2
+          - laravel: 9.*
+            guzzle: 6.*
+
+    name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
 
     steps:
       - name: Checkout code
@@ -61,7 +72,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer self-update ${{ matrix.composer-version }}
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "guzzlehttp/guzzle:${{ matrix.guzzle }}" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
diff --git a/composer.json b/composer.json
index d9f7dd8..fb38f73 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "illuminate/filesystem": "^7.0|^8.0|^9.0",
         "illuminate/console": "^7.0|^8.0|^9.0",
         "maennchen/zipstream-php": "^2.1",
-        "guzzlehttp/guzzle": "^7.2",
+        "guzzlehttp/guzzle": "^6.3|^7.2",
         "aws/aws-sdk-php": "^3.20.0"
     },
     "require-dev": {