Statamic 4.x and Laravel 10.x support (#12) (#13)

* Adds v4 support (#12) * enable laravel 10 support * update github actions * update excludes * update exclusions * fix testbench version --------- Co-authored-by: Quinten Buis <[email protected]>
swiftmade · Jun 7, 2023 · 35f84b9 · 35f84b9
1 parent 69166cd
commit 35f84b9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,22 +4,29 @@ on: [push]
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
         php: [7.4, 8.0, 8.1, 8.2]
-        laravel: [8.*, 9.*]
-        stability: [prefer-stable]
+        laravel: [8.*, 9.*, 10.*]
+        statamic: [3.*, 4.*]
         exclude:      
           - laravel: 8.*
             php: 8.2
           - laravel: 9.*
             php: 7.4
+          - laravel: 8.*
+            statamic: 4.*
+          - laravel: 10.*
+            statamic: 3.*
+          - laravel: 10.*
+            php: 7.4
+          - laravel: 10.*
+            php: 8.0
         dependency-version: [prefer-stable]
 
-    name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - S${{ matrix.statamic }}
 
     steps:
       - name: Checkout code
@@ -37,7 +44,7 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
       - name: Install dependencies
-        run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+        run: composer require laravel/framework:${{ matrix.laravel }} statamic/cms:${{ matrix.statamic }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
         run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "laravel/framework": "^7.30.3 || ^8.24 || ^9.0",
-        "statamic/cms": "^3.0.0"
+        "laravel/framework": "^7.30.3 || ^8.24 || ^9.0 || ^10.0",
+        "statamic/cms": "^3.0.0|^4.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.8",
         "nunomaduro/collision": "^4.1 || ^5.0 || ^6.0",
-        "orchestra/testbench": "^5.0|^6.0|^7.0",
+        "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
         "phpunit/phpunit": "^9.5"
     },
     "autoload": {