Merge pull request #85 from milwad-dev/add-support-laravel-11

[1.x] Support Laravel 11
milwad-dev · Mar 28, 2024 · 1dd477c · 1dd477c
2 parents faa505a + ced3003
commit 1dd477c
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 41 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -3,40 +3,57 @@ name: "Run Tests"
 on: [push, pull_request]
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [8.2, 8.1, 8.0]
-        laravel: [10.*, 9.*]
-        dependency-version: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 10.*
-            testbench: 8.*
-          - laravel: 9.*
-            testbench: 7.*
-
-        exclude:
-          - laravel: 10.*
-            php: 8.0
-
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
-          coverage: none
-
-      - name: Install dependencies
-        run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" "mockery/mockery:^1.3.2" "nesbot/carbon:>=2.62.1" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
-      - name: Execute tests
-        run: vendor/bin/phpunit
+    test:
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                php: [8.0, 8.1, 8.2, 8.3]
+                laravel: [9.*, 10.*, 11.*]
+                dependency-version: [prefer-lowest, prefer-stable]
+                include:
+                    - laravel: 11.*
+                      testbench: 9.*
+                      phpunit: 11.*
+
+                    - laravel: 10.*
+                      testbench: 8.*
+                      phpunit: 11.*
+
+                    - laravel: 9.*
+                      testbench: 7.*
+                      phpunit: 10.*
+
+                exclude:
+                    - laravel: 11.*
+                      php: 8.1
+
+                    - laravel: 11.*
+                      php: 8.0
+
+                    - laravel: 10.*
+                      php: 8.0
+
+                    - laravel: 9.*
+                      php: 8.3
+
+        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
+                  coverage: none
+
+            - name: Install dependencies
+              run: |
+                  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" "mockery/mockery:^1.3.2" "nesbot/carbon:>=2.62.1" --no-interaction --no-update
+                  composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+
+            - name: Execute tests
+              run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -26,16 +26,15 @@
   ],
   "require": {
     "php": "^8.0",
-    "laravel/framework": "9.*|10.*",
+    "laravel/framework": "9.*|10.*|11.*",
     "morilog/jalali": "3.*",
     "ext-bcmath": "*",
     "ext-ctype": "*"
   },
   "require-dev": {
-    "roave/security-advisories": "dev-latest",
     "imanghafoori/php-imports-analyzer": "1.0.*",
-    "orchestra/testbench": "^7.0|8.*",
-    "phpunit/phpunit": "^9.0"
+    "orchestra/testbench": "^7.0|^8.0|^9.0",
+    "phpunit/phpunit": "^9.0|^10.0|^11.0"
   },
   "autoload": {
     "psr-4": {