Laravel 10.x Compatibility (#88)

* Bump dependencies for Laravel 10 * Update GitHub Actions for Laravel 10 * Correct version matrix * Use future version of TestBench * Exclude lower PHP versions for Laravel 10 * Attempt to fix tests Co-authored-by: Freek Van der Herten <freek@spatie.be>
spatie · Jan 14, 2023 · fe06cf8 · fe06cf8
1 parent dab713b
commit fe06cf8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -14,16 +14,22 @@ jobs:
             matrix:
                 os: [ubuntu-latest, windows-latest]
                 php: [8.2, 8.1, 8.0, 7.4]
-                laravel: [9.*, 8.*, 7.*]
+                laravel: [10.*, 9.*, 8.*, 7.*]
                 stability: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 10.*
+                      testbench: 8.*
                     - laravel: 9.*
                       testbench: 7.*
                     - laravel: 8.*
                       testbench: ^6.23
                     - laravel: 7.*
                       testbench: ^5.20
                 exclude:
+                    - php: 7.4
+                      laravel: 10.*
+                    - php: 8.0
+                      laravel: 10.*
                     - php: 7.4
                       laravel: 9.*
                     - php: 8.1
@@ -50,7 +56,7 @@ jobs:
                   echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
             - name: Install dependencies
               run: |
-                  composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+                  composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.65" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
                   composer update --${{ matrix.stability }} --prefer-dist --no-interaction
             - name: Execute tests
               run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "laravel/framework": "~5.8.0|^6.0|^7.0|^8.0|^9.0",
+        "laravel/framework": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
         "league/glide": "^1.5|^1.6|^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.20|^6.13|^7.0"
+        "orchestra/testbench": "^5.20|^6.13|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {