Merge pull request #2 from daun/develop

Support Statamic 5 with Laravel 11
daun · Jun 20, 2024 · 8611ce7 · 8611ce7
2 parents 75aae9c + a4b9b9c
commit 8611ce7
Show file tree

Hide file tree

Showing 10 changed files with 1,068 additions and 1,991 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,10 +12,12 @@ jobs:
       fail-fast: true
       matrix:
         php: [ '8.1', '8.2', '8.3' ]
-        laravel: [ '9', '10' ]
-        # exclude:
-        #   - php: '8.0'
-        #     laravel: '10'
+        laravel: [ '9', '10', '11' ]
+        exclude:
+          - php: '8.0'
+            laravel: '10'
+          - php: '8.1'
+            laravel: '11'
 
     name: PHP ${{ matrix.php }} / Laravel ${{ matrix.laravel }}
 
@@ -49,6 +51,14 @@ jobs:
           max_attempts: 3
           command: composer require "laravel/framework:10.*" "orchestra/testbench:^8.21" "pestphp/pest:^2.34" "pestphp/pest-plugin-laravel:^2.3" "spatie/pest-plugin-snapshots:^2.1" --no-update --no-interaction
 
+      - name: Select Laravel 11
+        uses: nick-invision/retry@v3
+        if: ${{ matrix.laravel == '11' }}
+        with:
+          timeout_minutes: 3
+          max_attempts: 3
+          command: composer require "laravel/framework:11.*" "orchestra/testbench:^9.1" "pestphp/pest:^2.34" "pestphp/pest-plugin-laravel:^2.3" "spatie/pest-plugin-snapshots:^2.1" --no-update --no-interaction
+
       - name: Install PHP Dependencies
         uses: nick-invision/retry@v3
         with:
@@ -64,7 +74,7 @@ jobs:
 
       - name: Check code coverage
         uses: codecov/codecov-action@v4
-        if: ${{ matrix.php == '8.3' && matrix.laravel == '10' }}
+        if: ${{ matrix.php == '8.3' && matrix.laravel == '11' }}
         with:
           file: ./coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
         "guzzlehttp/guzzle": "^7.8",
         "intervention/image": "^2.7",
         "kornrunner/blurhash": "^1.2",
-        "laravel/framework": "^9.21 || ^10.0",
+        "laravel/framework": "^9.21 || ^10.0 || ^11.0",
         "srwiez/thumbhash": "^1.2",
-        "statamic/cms": "^4.0"
+        "statamic/cms": "^4.0 || ^5.0"
     },
     "require-dev": {
         "larastan/larastan": "^2.9",