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

Laravel 11.x Compatibility
rawilk · Mar 5, 2024 · a70cb4a · a70cb4a
2 parents 49194f2 + ca74671
commit a70cb4a
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 52 deletions.
diff --git a/.github/workflows/pest.yml b/.github/workflows/pest.yml
@@ -1,54 +1,59 @@
 name: Tests
 
 on:
-    push:
-        paths:
-            - '**.php'
-            - 'phpunit.xml.dist'
-            - '.github/workflows/pest.yml'
-            - 'composer.json'
-    pull_request:
-        branches: [main]
+  push:
+    paths:
+      - **.php
+      - phpunit.xml.dist
+      - .github/workflows/pest.yml
+      - composer.json
+  pull_request:
+    branches:
+      - main
 
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [8.3, 8.2, 8.1]
-                laravel: [10.*]
-                stability: [prefer-lowest, prefer-stable]
-                include:
-                    -   laravel: 10.*
-                        testbench: 8.*
-                        filament: ^3.2.6
-
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v4
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-                    coverage: none
-
-            -   name: Setup problem matchers
-                run: |
-                    echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-                    echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-            -   name: Install dependencies
-                run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "filament/filament:${{ matrix.filament }}" --no-interaction --no-update
-                    composer update --${{ matrix.stability }} --prefer-dist --no-interaction
-
-            -   name: List Installed Dependencies
-                run: composer show -D
-
-            -   name: Execute tests
-                run: vendor/bin/pest --stop-on-failure --parallel --display-skipped
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.3, 8.2, 8.1]
+        laravel: ['10.*', '11.*']
+        stability: [prefer-lowest, prefer-stable]
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+            filament: ^3.2.6
+        exclude:
+          - laravel: 11.*
+            php: 8.1
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "filament/filament:${{ matrix.filament }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: List Installed Dependencies
+        run: composer show -D
+
+      - name: Execute tests
+        run: vendor/bin/pest --stop-on-failure --parallel --display-skipped
diff --git a/composer.json b/composer.json
@@ -22,14 +22,14 @@
     "require": {
         "php": "^8.1|^8.2|^8.3",
         "filament/forms": "^3.2",
-        "illuminate/contracts": "^10.0",
+        "illuminate/contracts": "^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.14"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.9",
+        "nunomaduro/collision": "^7.9|^8.0",
         "larastan/larastan": "^2.6",
-        "orchestra/testbench": "^8.8",
+        "orchestra/testbench": "^8.8|^9.0",
         "pestphp/pest": "^2.20",
         "pestphp/pest-plugin-laravel": "^2.2",
         "pestphp/pest-plugin-livewire": "^2.1",