From 257b347f748665c68e860da6234aa487f42ebc9b Mon Sep 17 00:00:00 2001
From: Marick van Tuil <info@marickvantuil.nl>
Date: Wed, 8 Feb 2023 21:29:03 +0100
Subject: [PATCH] Bring back support for Laravel 6 and 7

---
 .github/workflows/run-tests.yml |  6 +++++-
 CHANGELOG.md                    |  1 -
 README.md                       |  2 +-
 composer.json                   | 13 ++++++-------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index dadb56e..3477460 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -21,6 +21,10 @@ jobs:
           - { queue: 'github-actions-laravel8-php81', laravel: '8.*', php: '8.1', 'testbench': '6.*'}
           - { queue: 'github-actions-laravel8-php80', laravel: '8.*', php: '8.0', 'testbench': '6.*'}
           - { queue: 'github-actions-laravel8-php74', laravel: '8.*', php: '7.4', 'testbench': '6.*'}
+          - { queue: 'github-actions-laravel7-php80', laravel: '7.*', php: '8.0', 'testbench': '5.*' }
+          - { queue: 'github-actions-laravel7-php74', laravel: '7.*', php: '7.4', 'testbench': '5.*' }
+          - { queue: 'github-actions-laravel6-php80', laravel: '6.*', php: '8.0', 'testbench': '4.*' }
+          - { queue: 'github-actions-laravel6-php74', laravel: '6.*', php: '7.4', 'testbench': '4.*' }
 
     name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }} - DB ${{ matrix.db }}
 
@@ -41,7 +45,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.payload.laravel }}" "orchestra/testbench:${{ matrix.payload.testbench }}" --no-interaction --no-update
-          composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
+          composer update --prefer-stable --prefer-dist --no-interaction
           if [ "${{ matrix.db }}" = "mysql" ]; then
             while ! mysqladmin ping --host=127.0.0.1 --user=cloudtasks --port=3307 --password=cloudtasks --silent; do
               echo "Waiting for MySQL..."
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e8a30f..7bb6958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 **Changed**
 
 - Added support for Laravel 10
-- Dropped support for Laravel 6 and 7
 
 ## 3.3.2 - 2022-11-19
 
diff --git a/README.md b/README.md
index 688a1b4..dfa57b3 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This package allows Google Cloud Tasks to be used as the queue driver.
   </summary>
 
   <br>
-  This package requires Laravel 8 or higher and supports MySQL 8 and PostgreSQL 14. Might support older database versions too, but package hasn't been tested for it.
+  This package requires Laravel 6 or higher and supports MySQL 8 and PostgreSQL 14. Might support older database versions too, but package hasn't been tested for it.
 
 Please check the [Laravel support policy](https://laravel.com/docs/master/releases#support-policy) table for supported Laravel and PHP versions.
 </details>
diff --git a/composer.json b/composer.json
index 20ae1d3..31845d4 100644
--- a/composer.json
+++ b/composer.json
@@ -11,11 +11,10 @@
         "ext-json": "*",
         "phpseclib/phpseclib": "~2.0",
         "google/cloud-tasks": "^1.10",
-        "illuminate/support": "^8.0|^9.0|^10.0",
         "thecodingmachine/safe": "^1.0|^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
+        "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
         "nunomaduro/larastan": "^1.0 || ^2.0",
         "thecodingmachine/phpstan-safe-rule": "^1.2",
         "laravel/legacy-factories": "^1.3"
@@ -43,23 +42,23 @@
     "scripts": {
         "l10": [
             "composer require laravel/framework:10.* orchestra/testbench:8.* --no-interaction --no-update",
-            "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
+            "composer update --prefer-stable --prefer-dist --no-interaction"
         ],
         "l9": [
             "composer require laravel/framework:9.* orchestra/testbench:7.* --no-interaction --no-update",
-            "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
+            "composer update --prefer-stable --prefer-dist --no-interaction"
         ],
         "l8": [
             "composer require laravel/framework:8.* orchestra/testbench:6.* --no-interaction --no-update",
-            "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
+            "composer update --prefer-stable --prefer-dist --no-interaction"
         ],
         "l7": [
             "composer require laravel/framework:7.* orchestra/testbench:5.* --no-interaction --no-update",
-            "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
+            "composer update --prefer-stable --prefer-dist --no-interaction"
         ],
         "l6": [
             "composer require laravel/framework:6.* orchestra/testbench:4.* --no-interaction --no-update",
-            "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
+            "composer update --prefer-stable --prefer-dist --no-interaction"
         ]
     }
 }