From 0be680e1511a5a453cd7032d50dd312ceeda83bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20L=C3=B6sken?= <holger.loesken@codedge.de>
Date: Sat, 11 Jan 2025 13:32:56 +0100
Subject: [PATCH] Add Laravel 11

---
 .github/workflows/tests.yml | 20 +++++++-------------
 composer.json               | 10 +++++-----
 phpunit.xml.dist            | 11 +++++------
 tests/FpdfTest.php          |  2 +-
 tests/TestCase.php          |  4 ----
 5 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b15bc76..77b2a7e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,20 +9,14 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.1', '8.2']
-        laravel: ['9.*', '10.*', '11.*']
+        php: ['8.3', '8.4']
+        laravel: [10.*, 11.*]
         dependency-version: [prefer-stable]
         include:
+          - laravel: 11.*
+          - testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 11.*
-            testbench: 9.*
-        exclude:
-          - laravel: 11.*
-            php: '8.1'
-
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
@@ -38,7 +32,7 @@ jobs:
       - 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
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
         env:
           APP_ENV: testing
 
@@ -51,7 +45,7 @@ jobs:
         name: Push coverage to codecov
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./clover.xml
+          file: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
-          fail_ci_if_error: true
+          fail_ci_if_error: false
diff --git a/composer.json b/composer.json
index 1d057f3..bad4fb5 100644
--- a/composer.json
+++ b/composer.json
@@ -18,13 +18,13 @@
         "source": "https://github.com/codedge/laravel-fpdf"
     },
     "require": {
-        "php": "^8.1",
-        "illuminate/support": "^9.0 || ^10.0 || ^11.0"
+        "php": "~8.3 || ~8.4",
+        "illuminate/support": "^10.0 || ^11.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.39",
-        "orchestra/testbench": "^7.35.0 || ^8.0 || ^9.0",
-        "phpunit/phpunit": "^9.6.0 || ^10.5"
+        "orchestra/testbench": "^8.0 || ^9.0",
+        "phpunit/phpunit": "^10.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -55,6 +55,6 @@
         }
     },
     "scripts": {
-        "test": "phpunit"
+        "test": "phpunit --coverage-clover coverage.xml"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a3a7dca..a79b63a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,12 +16,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/Facades</directory>
-            <directory suffix=".php">src/Fpdf</directory>
-        </whitelist>
-    </filter>
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
 
     <logging>
         <log type="coverage-clover" target="clover.xml"/>
diff --git a/tests/FpdfTest.php b/tests/FpdfTest.php
index 2a9d337..026ae91 100644
--- a/tests/FpdfTest.php
+++ b/tests/FpdfTest.php
@@ -8,7 +8,7 @@
 
 class FpdfTest extends TestCase
 {
-    protected $fpdf;
+    protected Fpdf $fpdf;
 
     public function setUp(): void
     {
diff --git a/tests/TestCase.php b/tests/TestCase.php
index f797331..7146a74 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -9,10 +9,6 @@
 
 abstract class TestCase extends Orchestra
 {
-    /**
-     * @param  \Illuminate\Foundation\Application  $app
-     * @return array|string[]
-     */
     protected function getPackageProviders($app)
     {
         return [