Merge pull request #342 from laravel-shift/l11-compatibility

Laravel 11.x Compatibility
rakutentech · Mar 22, 2024 · 464851a · 464851a
2 parents 3cf4d35 + d147975
commit 464851a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/.github/workflows/phptest.yml b/.github/workflows/phptest.yml
@@ -1,16 +1,16 @@
-on: [push]
+on:
+  - push
 
-name: "CI PHP"
+name: CI PHP
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         php: [7.4, 8.0, 8.1, 8.2, 8.3]
-        laravel: [8.*]
+        laravel: ['8.*', '11.*']
         include:
           - php: 8.0
             laravel: 9.*
@@ -24,6 +24,15 @@ jobs:
             laravel: 10.*
           - php: 8.3
             laravel: 10.*
+          - php: '8.2'
+            laravel: 11.*
+        exclude:
+          - laravel: 11.*
+            php: 7.4
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -47,12 +56,12 @@ jobs:
 
       - name: Composer Install
         run: |
-            composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
-            composer install
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer install
 
       - name: PHPUNIT Tests
         run: |
-            ./vendor/bin/phpunit --coverage-clover=coverage.xml
+          ./vendor/bin/phpunit --coverage-clover=coverage.xml
 
       - name: Upload to codecov
         uses: codecov/codecov-action@v3

diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - master
 
-name: "CI Release Dist"
+name: CI Release Dist
 
 jobs:
   test:
@@ -13,13 +13,15 @@ jobs:
 
     strategy:
       matrix:
-        node-versions: [20]
+        node-versions:
+          - 20
 
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
         with:
           access_token: ${{ github.token }}
+
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -47,7 +49,7 @@ jobs:
         uses: peter-evans/create-pull-request@v4
         with:
           commit-message: (action) Update dist
-          title: "(action) update dist astro"
+          title: (action) update dist astro
 
       - name: Export dist to resources for gh-pages
         working-directory: ./ui

diff --git a/composer.json b/composer.json
@@ -17,19 +17,19 @@
     ],
     "require": {
         "php": "^7.4|^8.0|^8.1|^8.2|^8.3",
-        "illuminate/contracts": "^8.37|^9.0|^10.0",
+        "illuminate/contracts": "^8.37|^9.0|^10.0|^11.0",
         "kitloong/laravel-app-logger": "^1.0",
         "spatie/laravel-package-tools": "^1.4.3",
         "ext-json": "*"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.12|dev-master",
-        "brianium/paratest": "^6.2",
+        "brianium/paratest": "^6.2|^7.4",
         "friendsofphp/php-cs-fixer": "^3.5",
-        "nunomaduro/collision": "^5.3|^6.0",
+        "nunomaduro/collision": "^5.3|^6.0|^8.0",
         "nunomaduro/larastan": "^1.0|^2.4",
-        "orchestra/testbench": "^6.15|^7.0|^8.0",
-        "phpunit/phpunit": "^9.3",
+        "orchestra/testbench": "^6.15|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.3|^10.5",
         "spatie/laravel-ray": "^1.23",
         "squizlabs/php_codesniffer": "^3.6",
         "vimeo/psalm": "^4.8|^5.6"