Merge pull request #17 from asbiin/patch-1

Support Laravel 11
mauricius · Mar 19, 2024 · 06bb4d5 · 06bb4d5
2 parents 9774841 + 5c76907
commit 06bb4d5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,33 +1,28 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
     test:
         strategy:
-            fail-fast: true
+            fail-fast: false
             matrix:
-                php: [8.0, 8.1, 8.2]
-                laravel: [^8.80, 9.*, 10.*]
+                php: ['8.1', '8.2', '8.3']
+                laravel: ['9.0', '10.0', '11.0']
                 dependency-version: [prefer-lowest, prefer-stable]
-                include:
-                    -   laravel: 10.*
-                        testbench: 8.*
-                    -   laravel: 9.*
-                        testbench: 7.*
-                    -   laravel: ^8.80
-                        testbench: 6.23
                 exclude:
-                    -   laravel: 10.*
-                        php: 8.0
-                    -   laravel: ^8.80
-                        php: 8.2
+                    -   laravel: '11.0'
+                        php: '8.1'
 
         runs-on: ubuntu-latest
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
         steps:
             -   name: Checkout code
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
@@ -37,7 +32,8 @@ jobs:
 
             -   name: Install dependencies
                 run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-                    composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+                    composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
+                    composer update --${{ matrix.dependency-version }} --prefer-dist  --no-progress --no-interaction
+
             -   name: Execute tests
                 run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -17,14 +17,14 @@
     ],
     "require": {
         "ext-mbstring": "*",
-        "php": "^8.0|^8.1|^8.2",
-        "illuminate/contracts": "^8.80|^9.0|^10.0"
+        "php": "^8.1",
+        "illuminate/contracts": "^9.0|^10.0|^11.0"
     },
     "require-dev": {
-        "nunomaduro/collision": "^5.0|^6.0|^7.0",
-        "orchestra/testbench": "^6.0|^7.0|^8.0",
+        "nunomaduro/collision": "^6.0|^7.0|^8.1",
+        "orchestra/testbench": "^7.0|^8.0|^9.0",
         "phpunit/phpunit": "^9.5|^10.0",
-        "spatie/phpunit-snapshot-assertions": "^4.2"
+        "spatie/phpunit-snapshot-assertions": "^4.2|^5.0"
     },
     "autoload": {
         "psr-4": {