Merge pull request #64 from tanhongit/develop

Laravel 11.x Support
cslant · Mar 18, 2024 · cf396ff · cf396ff
2 parents fc5cbd8 + 40b6b0c
commit cf396ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.26.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
 

diff --git a/.github/workflows/setup_test.yml b/.github/workflows/setup_test.yml
@@ -10,12 +10,17 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
         php: [ '8.1', '8.2', '8.3' ]
-        laravel: [ 10.*, 9.* ]
+        laravel: [ 11.*, 10.*, 9.* ]
         include:
+          - laravel: 11.*
+            testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
             testbench: 8.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/composer.json b/composer.json
@@ -40,11 +40,11 @@
     "cslant/telegram-git-notifier": "^v1.3"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^v3.37",
+    "friendsofphp/php-cs-fixer": "^v3.0",
     "nunomaduro/collision": "^7.10",
-    "nunomaduro/larastan": "^2.6",
-    "orchestra/testbench": "^8.14",
-    "pestphp/pest": "^2.24",
+    "nunomaduro/larastan": "^2.9",
+    "orchestra/testbench": "^8.0",
+    "pestphp/pest": "^2.0",
     "phpstan/extension-installer": "^1.3",
     "phpstan/phpstan-deprecation-rules": "^1.1",
     "phpstan/phpstan-phpunit": "^1.3"