Merge pull request #44 from laravel-shift/l10-compatibility

Laravel 10.x Compatibility
torchlight-api · Feb 14, 2023 · fe2b0dd · fe2b0dd
2 parents 3c7d670 + 9600805
commit fe2b0dd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,9 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 7.3, 7.4, 8.0, 8.1 ]
-        laravel: [ 7.*, 8.*, 9.* ]
+        laravel: [ 7.*, 8.*, 9.* , 10.*]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
+          - laravel: 10.*
+            testbench: 8.*
           - laravel: 7.*
             testbench: 5.*
 
@@ -29,6 +31,12 @@ jobs:
             testbench: 7.*
 
         exclude:
+          - laravel: 10.*
+            php: 7.3
+          - laravel: 10.*
+            php: 7.4
+          - laravel: 10.*
+            php: 8.0
           - laravel: 9.*
             php: 7.3
 
@@ -63,18 +71,14 @@ jobs:
 
       - name: Install dependencies
         run: |
+          composer config minimum-stability dev
           composer self-update
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
         run: vendor/bin/phpunit
 
-      - name: Install Livewire V1
-        if: "! startsWith(matrix.laravel, '9.')"
-        run: |
-          composer require "livewire/livewire:^1" --no-interaction
-
       - name: Execute tests
         if: "! startsWith(matrix.laravel, '9.')"
         run: vendor/bin/phpunit

diff --git a/composer.json b/composer.json
@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/support": "^7.26.0|^8.0|^9.0",
-        "illuminate/console": "^7.26.0|^8.0|^9.0",
-        "illuminate/http": "^7.26.0|^8.0|^9.0",
-        "illuminate/cache": "^7.26.0|^8.0|^9.0",
-        "illuminate/view": "^7.26.0|^8.0|^9.0",
+        "illuminate/support": "^7.26.0|^8.0|^9.0|^10.0",
+        "illuminate/console": "^7.26.0|^8.0|^9.0|^10.0",
+        "illuminate/http": "^7.26.0|^8.0|^9.0|^10.0",
+        "illuminate/cache": "^7.26.0|^8.0|^9.0|^10.0",
+        "illuminate/view": "^7.26.0|^8.0|^9.0|^10.0",
         "guzzlehttp/guzzle": "^7.2",
         "ramsey/uuid": "^3.7|^4.0"
     },