Merge pull request #352 from Laravel-Lang/16.x

Added Laravel 11 support
Laravel-Lang · Mar 13, 2024 · b33e0c2 · b33e0c2
2 parents 3515797 + 86f41dd
commit b33e0c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -12,10 +12,12 @@ jobs:
             fail-fast: true
             matrix:
                 php: [ "8.1", "8.2", "8.3" ]
-                laravel: [ "10.0" ]
-                prefer: [ "stable", "lowest" ]
+                laravel: [ "10.0", "11.0" ]
+                exclude:
+                    - laravel: "11.0"
+                      php: "8.1"
 
-        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }} ${{ matrix.prefer }}
+        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
             -   name: Checkout code
@@ -31,7 +33,7 @@ jobs:
                     COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             -   name: Install dependencies
-                run: composer require laravel/framework:^${{ matrix.laravel }} --prefer-${{ matrix.prefer }}
+                run: composer require laravel/framework:^${{ matrix.laravel }}
 
             -   name: Execute tests
                 run: sudo vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -48,16 +48,16 @@
         "composer/semver": "^3.4",
         "dragon-code/pretty-array": "^4.1",
         "dragon-code/support": "^6.11.3",
-        "illuminate/collections": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/support": "^10.0",
+        "illuminate/collections": "^10.0 || ^11.0",
+        "illuminate/console": "^10.0 || ^11.0",
+        "illuminate/support": "^10.0 || ^11.0",
         "laravel-lang/locales": "^2.3",
         "league/commonmark": "^2.4.1",
         "league/config": "^1.2"
     },
     "require-dev": {
         "laravel-lang/json-fallback": "^2.0",
-        "orchestra/testbench": "^8.14",
+        "orchestra/testbench": "^8.14 || ^9.0",
         "phpunit/phpunit": "^10.4.2",
         "symfony/var-dumper": "^6.3.6 || ^7.0"
     },