From 8eeafda290e9a09abe6b102c3925c9434d1c87a5 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Wed, 11 Jan 2023 17:19:01 +0100
Subject: [PATCH] Laravel v10 Support (#109)

* Update composer.json

* Update tests.yml

* Remove irrelevant `orchestra/database` requirement since Laravel 5.8 support `--realpath` migration (#1)

* Remove irrelevant orchestra/database requirement since Laravel 5.8 support --realpath migration

* wip

* wip

* wip

* wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Co-authored-by: Mior Muhammad Zaki <crynobone@gmail.com>
---
 .github/workflows/tests.yml | 43 +++++++++++++++++++++++++++++--------
 composer.json               |  9 ++++----
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dd2feb4..57a8fb9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,42 +13,53 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
-        laravel: [5.8.*, 6.*, 7.*, 8.*, 9.*]
+        php: [7.1, 7.2, 7.3, 7.4, '8.0', 8.1, 8.2]
+        laravel: [5.8.*, 6.*, 7.*, 8.*, 9.*, 10.*]
         os: [ubuntu-latest]
         include:
+          - laravel: 10.*
+            testbench: 8.*
+            dbal: 3.*
           - laravel: 9.*
             testbench: 7.*
-            database: 7.*
+            dbal: 3.*
           - laravel: 8.*
             testbench: 6.*
-            database: 6.*
+            dbal: 3.*
           - laravel: 7.*
             testbench: 5.*
-            database: 5.*
+            dbal: 2.*
           - laravel: 6.*
             testbench: 4.*
-            database: 4.*
+            dbal: 2.*
           - laravel: 5.8.*
             testbench: 3.8.*
-            database: 3.8.*
+            dbal: 2.*
         exclude:
           - laravel: 5.8.*
-            php: 8.0
+            php: '8.0'
           - laravel: 5.8.*
             php: 8.1
+          - laravel: 5.8.*
+            php: 8.2
           - laravel: 6.*
             php: 7.1
           - laravel: 6.*
             php: 8.1
+          - laravel: 6.*
+            php: 8.2
           - laravel: 7.*
             php: 7.1
           - laravel: 7.*
             php: 8.1
+          - laravel: 7.*
+            php: 8.2
           - laravel: 8.*
             php: 7.1
           - laravel: 8.*
             php: 7.2
+          - laravel: 8.*
+            php: 8.2
           - laravel: 9.*
             php: 7.1
           - laravel: 9.*
@@ -57,6 +68,16 @@ jobs:
             php: 7.3
           - laravel: 9.*
             php: 7.4
+          - laravel: 10.*
+            php: 7.1
+          - laravel: 10.*
+            php: 7.2
+          - laravel: 10.*
+            php: 7.3
+          - laravel: 10.*
+            php: 7.4
+          - laravel: 10.*
+            php: '8.0'
 
     name: PHP ${{ matrix.php }} / Laravel ${{ matrix.laravel }}
 
@@ -73,8 +94,12 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "illuminate/contracts:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "orchestra/database:${{ matrix.database }}" --no-interaction --no-update
+          composer require "illuminate/contracts:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer require "doctrine/dbal:${{ matrix.dbal }}" --dev --no-interaction --no-update
           composer install --prefer-dist --no-interaction --no-suggest
 
+      - name: Installed dependencies
+        run: composer show -D
+
       - name: Run tests
         run: vendor/bin/phpunit --exclude-group skipped
diff --git a/composer.json b/composer.json
index b11439b..8813ec5 100644
--- a/composer.json
+++ b/composer.json
@@ -10,13 +10,12 @@
     ],
     "require": {
         "php": "^7.1.3|^8.0",
-        "illuminate/database": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+        "illuminate/database": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
+        "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.9",
-        "orchestra/database": "3.8.* || 3.9.* || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "orchestra/testbench": "3.8.* || 3.9.* || ^4.0 || ^6.0 || ^7.0",
+        "doctrine/dbal": "^2.9 || ^3.1.4",
+        "orchestra/testbench": "3.8.* || 3.9.* || ^4.0 || ^6.0 || ^7.0 || ^8.0",
         "phpunit/phpunit": "^7.5 || ^8.4 || ^9.0"
     },
     "autoload": {