Merge branch 'main' of https://github.com/statamic-rad-pack/campaign-…

…monitor
statamic-rad-pack · Apr 12, 2024 · b442360 · b442360
2 parents c07d502 + 477b026
commit b442360
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,20 +7,16 @@ on:
 jobs:
   php-tests:
     runs-on: ${{ matrix.os }}
+
     strategy:
       matrix:
+        php: [8.3, 8.2]
+        laravel: [10.*, 11.*]
+        statamic: [^5.0]
         os: [ubuntu-latest]
-        php: [8.1, 8.2]
-        laravel: [9.*, 10.*]
-        dependency-version: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 9.*
-            framework: ^9.0
-            testbench: 7.*
-          - laravel: 10.*
-            framework: ^10.0
-            testbench: 8.*
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.statamic }} - ubuntu-latest
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -40,8 +36,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-             composer require "laravel/framework:${{ matrix.framework }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-             composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          composer require "laravel/framework:${{ matrix.laravel }}" "statamic/cms:${{ matrix.statamic }}" --no-interaction --no-update
+          composer install --no-interaction
 
       - name: Execute tests
         run: vendor/bin/phpunit -c phpunit.xml

diff --git a/composer.json b/composer.json
@@ -14,18 +14,16 @@
     "require": {
         "php": "^8.1",
         "bashy/laravel-campaignmonitor": "^6.0",
-        "edalzell/forma": "^2.0",
-        "laravel/framework": "^9.0 || ^10.0",
+        "edalzell/forma": "^3.0",
+        "laravel/framework": "^10.25.0 || ^11.0",
         "pixelfear/composer-dist-plugin": "^0.1",
-        "statamic/cms": "^4.0"
+        "statamic/cms": "^4.0 || ^5.0"
     },
     "require-dev": {
         "jasonmccreary/laravel-test-assertions": "^2.0",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^6.0 || ^7.0",
-        "orchestra/testbench": "^7.0 || ^8.0",
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "spatie/laravel-ray": "*"
+        "orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.0 || ^10.0"
     },
     "autoload": {
         "psr-4": {
@@ -56,5 +54,6 @@
             "description": "Campaign Monitor addon",
             "name": "Campaign Monitor"
         }
-    }
+    },
+    "minimum-stability": "alpha"
 }