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

Laravel 11.x Compatibility
biscolab · Mar 27, 2024 · f712911 · f712911
2 parents 1412366 + 73a43d6
commit f712911
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,8 @@
 name: CI
-on: [push, pull_request]
+
+on:
+  - push
+  - pull_request
 
 jobs:
   run:
@@ -8,8 +11,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: [ 7.3, 7.4, '8.0', 8.1 ]
-        laravel: [ 7, 8, 9 , 10]
+        php: [7.3, 7.4, '8.0', 8.1, '8.2']
+        laravel: [7, 8, 9, 10, '11']
         exclude:
           - php: 7.3
             laravel: 10
@@ -21,24 +24,32 @@ jobs:
             laravel: 9
           - php: 7.4
             laravel: 9
+          - laravel: '11'
+            php: 7.3
+          - laravel: '11'
+            php: 7.4
+          - laravel: '11'
+            php: '8.0'
+          - laravel: '11'
+            php: 8.1
 
     name: PHP ${{ matrix.php }} Test on ${{ matrix.os }} – Laravel ${{ matrix.laravel }}
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{matrix.php}}
-
-    - name: Install dependencies
-      uses: php-actions/composer@v5
-      with:
-        args: --prefer-source --no-interaction
-
-    - name: Run composer test script
-      uses: php-actions/composer@v5
-      with:
-        command: test
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{matrix.php}}
+
+      - name: Install dependencies
+        uses: php-actions/composer@v5
+        with:
+          args: --prefer-source --no-interaction
+
+      - name: Run composer test script
+        uses: php-actions/composer@v5
+        with:
+          command: test
diff --git a/composer.json b/composer.json
@@ -20,12 +20,12 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/routing": "^7.0|^8.0|^9.0|^10.0",
-        "illuminate/support": "^7.0|^8.0|^9.0|^10.0"
+        "illuminate/routing": "^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "5.*|6.*|^7.0|^8.0",
-        "phpunit/phpunit": "^9.1"
+        "orchestra/testbench": "5.*|6.*|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.1|^10.5"
     },
     "autoload": {
         "psr-4": {