Updated Fpdf2 to version 3.0.

laurentmuller · Jan 30, 2025 · 0c3e48f · 0c3e48f
1 parent 5ea5254
commit 0c3e48f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "fakerphp/faker": "^1.0",
         "google/recaptcha": "^1.0",
         "imagine/imagine": "^1.0",
-        "laurentmuller/fpdf2": "^2.0",
+        "laurentmuller/fpdf2": "^3.0",
         "laurentmuller/highcharts-bundle": "^2.0",
         "phpoffice/phpspreadsheet": "^3.0",
         "phpoffice/phpword": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Pdf/Colors/PdfDrawColor.php b/src/Pdf/Colors/PdfDrawColor.php
@@ -13,6 +13,7 @@
 
 namespace App\Pdf\Colors;
 
+use fpdf\Color\PdfRgbColor;
 use fpdf\PdfDocument;
 
 /**
@@ -22,7 +23,8 @@ class PdfDrawColor extends AbstractPdfColor
 {
     public function apply(PdfDocument $doc): void
     {
-        $doc->setDrawColor($this->red, $this->green, $this->blue);
+        $color = PdfRgbColor::instance($this->red, $this->green, $this->blue);
+        $doc->setDrawColor($color);
     }
 
     /**

diff --git a/src/Pdf/Colors/PdfFillColor.php b/src/Pdf/Colors/PdfFillColor.php
@@ -13,6 +13,7 @@
 
 namespace App\Pdf\Colors;
 
+use fpdf\Color\PdfRgbColor;
 use fpdf\PdfDocument;
 
 /**
@@ -22,7 +23,8 @@ class PdfFillColor extends AbstractPdfColor
 {
     public function apply(PdfDocument $doc): void
     {
-        $doc->setFillColor($this->red, $this->green, $this->blue);
+        $color = PdfRgbColor::instance($this->red, $this->green, $this->blue);
+        $doc->setFillColor($color);
     }
 
     /**

diff --git a/src/Pdf/Colors/PdfTextColor.php b/src/Pdf/Colors/PdfTextColor.php
@@ -13,6 +13,7 @@
 
 namespace App\Pdf\Colors;
 
+use fpdf\Color\PdfRgbColor;
 use fpdf\PdfDocument;
 
 /**
@@ -22,7 +23,8 @@ class PdfTextColor extends AbstractPdfColor
 {
     public function apply(PdfDocument $doc): void
     {
-        $doc->setTextColor($this->red, $this->green, $this->blue);
+        $color = PdfRgbColor::instance($this->red, $this->green, $this->blue);
+        $doc->setTextColor($color);
     }
 
     /**

diff --git a/src/Report/MemoryImageReport.php b/src/Report/MemoryImageReport.php
@@ -26,6 +26,7 @@
 use App\Service\FontAwesomeImageService;
 use App\Service\ImageService;
 use App\Utils\FileUtils;
+use fpdf\Color\PdfRgbColor;
 use fpdf\Enums\PdfMove;
 use fpdf\Enums\PdfRectangleStyle;
 use fpdf\Enums\PdfTextAlignment;
@@ -243,10 +244,10 @@ private function renderDigits(): void
 
     private function renderEllipses(): void
     {
-        $this->setDrawColor(255, 0, 0);
+        $this->setDrawColor(PdfRgbColor::red());
         $this->ellipse(30, 220, 20, 10);
         $this->circle(65, 220, 10);
-        $this->setFillColor(0, 255, 0);
+        $this->setFillColor(PdfRgbColor::green());
         $this->circle(65, 245, 10, PdfRectangleStyle::BOTH);
         $this->ellipse(30, 245, 20, 10, PdfRectangleStyle::BOTH);
     }

diff --git a/vendor-bin/php-cs-fixer/composer.lock b/vendor-bin/php-cs-fixer/composer.lock