Laravel 11.x Compatibility (#1037)

* Bump dependencies for Laravel 11 * Update GitHub Actions for Laravel 11
barryvdh · Mar 4, 2024 · c8b8a84 · c8b8a84
1 parent 2f1fe26
commit c8b8a84
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 24 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -3,25 +3,27 @@ name: Tests
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
     branches:
-    - "*"
+      - *
   schedule:
-  - cron: '0 0 * * *'
+    - cron: '0 0 * * *'
 
 jobs:
   php-tests:
     runs-on: ubuntu-20.04
+
     timeout-minutes: 15
+
     env:
       COMPOSER_NO_INTERACTION: 1
 
     strategy:
       fail-fast: false
       matrix:
-        php: [8.0, 7.4, 7.3, 7.2]
-        laravel: [8.*, 7.*, 6.*]
+        php: [7.2, 7.3, 7.4, 8.0, '8.2']
+        laravel: ['6.*', '7.*', '8.*', '11.*']
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 11.*
@@ -50,28 +52,36 @@ jobs:
             php: 7.2
           - php: 8.0
             dependency-version: prefer-lowest
+          - laravel: 11.*
+            php: 7.2
+          - laravel: 11.*
+            php: 7.3
+          - laravel: 11.*
+            php: 7.4
+          - laravel: 11.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-        coverage: none
-        extensions: mbstring
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          extensions: mbstring
 
-    - name: Install dependencies
-      run: |
-        composer remove phpro/grumphp --no-update --dev
-        composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
-        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
+      - name: Install dependencies
+        run: |
+          composer remove phpro/grumphp --no-update --dev
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
 
-    - name: Run Static Analysis
-      run: composer phpstan
+      - name: Run Static Analysis
+        run: composer phpstan
 
-    - name: Execute Unit Tests
-      run: composer test
+      - name: Execute Unit Tests
+        run: composer test
diff --git a/composer.json b/composer.json
@@ -2,7 +2,11 @@
     "name": "barryvdh/laravel-dompdf",
     "description": "A DOMPDF Wrapper for Laravel",
     "license": "MIT",
-    "keywords": ["laravel", "dompdf", "pdf"],
+    "keywords": [
+        "laravel",
+        "dompdf",
+        "pdf"
+    ],
     "authors": [
         {
             "name": "Barry vd. Heuvel",
@@ -17,7 +21,7 @@
     "require-dev": {
         "orchestra/testbench": "^4|^5|^6|^7|^8|^9",
         "squizlabs/php_codesniffer": "^3.5",
-        "phpro/grumphp": "^1",
+        "phpro/grumphp": "^1 || ^2.5",
         "larastan/larastan": "^1.0|^2.7.0"
     },
     "autoload": {