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

Laravel 11.x Compatibility

.github/workflows/run-tests.yml

@@ -1,82 +1,49 @@
 name: run-tests
-on: [push, pull_request]
+
+on:
+  - push
+  - pull_request
+
 jobs:
-    test:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            fail-fast: false
-            matrix:
-                os: [ubuntu-latest, windows-latest]
-                php: [8.1, 8.0, 7.4, 7.3, 7.2]
-                laravel: [5.8.*, 6.20.*, 7.29.*, 8.20.*, 9.*, 10.*] # use lowest versions that support PHP 8
-                dependency-version: [prefer-lowest, prefer-stable]
-                include:
-                    -   laravel: 10.*
-                        testbench: 8.*
-                    -   laravel: 9.*
-                        testbench: 7.*
-                    -   laravel: 8.20.*
-                        testbench: 6.*
-                    -   laravel: 7.29.*
-                        testbench: 5.*
-                    -   laravel: 6.20.*
-                        testbench: 4.*
-                    -   laravel: 5.8.*
-                        testbench: 3.8.*
-                exclude:
-                    -   laravel: 10.*
-                        php: 8.0
-                    -   laravel: 10.*
-                        php: 7.4
-                    -   laravel: 10.*
-                        php: 7.3
-                    -   laravel: 10.*
-                        php: 7.2
-                    -   laravel: 9.*
-                        php: 7.4
-                    -   laravel: 9.*
-                        php: 7.3
-                    -   laravel: 9.*
-                        php: 7.2
-                    -   laravel: 8.20.*
-                        php: 8.1
-                    -   laravel: 8.20.*
-                        php: 7.2
-                    -   laravel: 7.29.*
-                        php: 8.1
-                    -   laravel: 7.29.*
-                        php: 8.0
-                    -   laravel: 6.20.*
-                        php: 8.1
-                    -   laravel: 6.20.*
-                        php: 8.0
-                    -   laravel: 5.8.*
-                        php: 8.1
-                    -   laravel: 5.8.*
-                        php: 8.0
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+  test:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        php: [8.2, 8.3]
+        laravel: [ '10.*', '11.*']
+        dependency-version: [prefer-lowest, prefer-stable]
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-            -   name: Cache dependencies
-                uses: actions/cache@v2
-                with:
-                    path: ~/.composer/cache/files
-                    key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.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: 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
-                    composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+      - 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 --no-suggest
 
-            -   name: Execute tests
-                run: vendor/bin/phpunit
+      - name: Execute tests
+        run: vendor/bin/phpunit

composer.json

@@ -20,15 +20,15 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/cookie": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/session": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0",
-        "laravel/tinker": "^1.0|^2.0"
+        "php": "^8.2",
+        "illuminate/support": "^10.0|^11.0",
+        "illuminate/cookie": "^10.0|^11.0",
+        "illuminate/session": "^10.0|^11.0",
+        "laravel/tinker": "^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0|^8.0",
-        "phpunit/phpunit": "^8.0|^9.0"
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^9.0|^10.5"
     },
     "autoload": {
         "psr-4": {