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

Laravel 11.x Compatibility
rawilk · Mar 10, 2024 · af35e92 · af35e92
2 parents cd9bc05 + 5280f08
commit af35e92
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 56 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,65 +1,70 @@
 name: Tests
 
 on:
-    push:
-        paths-ignore:
-            - '**.md'
-    pull_request:
-        paths-ignore:
-            - '**.md'
+  push:
+    paths-ignore:
+      - **.md
+  pull_request:
+    paths-ignore:
+      - **.md
 
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [8.2, 8.1]
-                laravel: [10.*, 9.*, 8.*]
-                stability: [prefer-lowest, prefer-stable]
-                include:
-                    -   laravel: 10.*
-                        testbench: 8.*
-                    -   laravel: 9.*
-                        testbench: 7.*
-                    -   laravel: 8.*
-                        testbench: ^6.23
-                exclude:
-                    -   laravel: 9.*
-                        php: 8.2
-                        stability: prefer-lowest
-                    -   laravel: 8.*
-                        php: 8.2
-                        stability: prefer-lowest
+  test:
+    runs-on: ubuntu-latest
 
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.2, 8.1]
+        laravel: ['8.*', '9.*', '10.*', '11.*']
+        stability: [prefer-lowest, prefer-stable]
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 9.*
+            testbench: 7.*
+          - laravel: 8.*
+            testbench: ^6.23
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 9.*
+            php: 8.2
+            stability: prefer-lowest
+          - laravel: 8.*
+            php: 8.2
+            stability: prefer-lowest
+          - laravel: 11.*
+            php: 8.1
 
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v3
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
-            -   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, fileinfo
-                    coverage: none
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-            -   name: Setup problem matchers
-                run: |
-                    echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-                    echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+      - 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, fileinfo
+          coverage: none
 
-            -   name: Install dependencies
-                run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --ignore-platform-reqs
-                    composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ignore-platform-reqs
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-            -   name: List Installed Dependencies
-                run: composer show -D
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --ignore-platform-reqs
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ignore-platform-reqs
 
-            -   name: Execute tests
-                run: vendor/bin/pest -p
-                env:
-                    PRINT_NODE_API_KEY: ${{ secrets.PRINT_NODE_API_KEY }}
-                    PRINT_NODE_ID: ${{ secrets.PRINT_NODE_ID }}
+      - name: List Installed Dependencies
+        run: composer show -D
+
+      - name: Execute tests
+        run: vendor/bin/pest -p
+        env:
+          PRINT_NODE_API_KEY: ${{ secrets.PRINT_NODE_API_KEY }}
+          PRINT_NODE_ID: ${{ secrets.PRINT_NODE_ID }}
diff --git a/composer.json b/composer.json
@@ -24,15 +24,15 @@
     "require": {
         "php": "^8.0|^8.1|^8.2",
         "guzzlehttp/guzzle": "^7.5",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "mike42/escpos-php": "^4.0",
         "spatie/laravel-package-tools": "^1.2|^1.13"
     },
     "require-dev": {
         "laravel/pint": "^1.5",
         "mockery/mockery": ">=1.4",
-        "orchestra/testbench": "^6.0|^7.0|^8.0",
-        "pestphp/pest": "^1.20",
+        "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0",
+        "pestphp/pest": "^1.20|^2.34",
         "pestphp/pest-plugin-parallel": "^1.0",
         "php-http/socket-client": "^2.1",
         "psr/http-client": "^1.0",