Updated PDF header and footer.

laurentmuller · Feb 6, 2025 · e30aca6 · e30aca6
1 parent 173d827
commit e30aca6
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 35 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Report/ReportFooter.php b/src/Report/ReportFooter.php
@@ -13,11 +13,11 @@
 
 namespace App\Report;
 
-use App\Pdf\PdfFont;
 use App\Pdf\PdfStyle;
 use App\Utils\FormatUtils;
 use fpdf\Enums\PdfTextAlignment;
 use fpdf\PdfBorder;
+use fpdf\PdfDocument;
 
 /**
  * Class to output footer in PDF documents.
@@ -71,35 +71,41 @@ public function setContent(string $content, ?string $url = null): self
         return $this;
     }
 
-    /**
-     * Gets the formatted current date.
-     */
-    private function getDate(): string
+    private function outputContent(float $width): self
     {
-        return $this->date ??= FormatUtils::formatDateTime(new \DateTime());
+        return $this->outputText($this->content, $width, PdfTextAlignment::CENTER, $this->url);
     }
 
-    /**
-     * Gets the formatted pages.
-     */
-    private function getPages(): string
+    private function outputDate(float $width): void
+    {
+        $text = $this->date ??= FormatUtils::formatDateTime(new \DateTime());
+
+        $this->outputText($text, $width, PdfTextAlignment::RIGHT);
+    }
+
+    private function outputPages(float $width): self
     {
         $parent = $this->parent;
+        $text = $parent->trans('report.page', [
+            '{0}' => $parent->getPage(),
+            '{1}' => $parent->getAliasNumberPages(),
+        ]);
 
-        return $parent->trans('report.page', ['{0}' => $parent->getPage(), '{1}' => '{nb}']);
+        return $this->outputText($text, $width, PdfTextAlignment::LEFT);
     }
 
     /**
      * Output the given text.
      */
-    private function outputText(string $text, float $width, PdfTextAlignment $align, ?string $link = null): self
+    private function outputText(?string $text, float $width, PdfTextAlignment $align, ?string $link = null): self
     {
+        $text ??= '';
         $this->parent->cell(
             width: $width,
             text: $text,
             border: PdfBorder::top(),
             align: $align,
-            link: $link
+            link: '' !== $text ? $link : null
         );
 
         return $this;
@@ -110,10 +116,10 @@ private function outputTexts(): void
         $parent = $this->parent;
         $parent->setY(-self::FOOTER_OFFSET);
         $width = $parent->getPrintableWidth() / 3.0;
-        PdfStyle::default()->setFontSize(PdfFont::DEFAULT_SIZE - 1.0)->apply($parent);
-        $this->outputText($this->getPages(), $width, PdfTextAlignment::LEFT)
-            ->outputText($this->content ?? '', $width, PdfTextAlignment::CENTER, $this->url)
-            ->outputText($this->getDate(), $width, PdfTextAlignment::RIGHT);
+        PdfStyle::default()->setFontSize(PdfDocument::LINE_HEIGHT - 1.0)->apply($parent);
+        $this->outputPages($width)
+            ->outputContent($width)
+            ->outputDate($width);
         $parent->resetStyle();
     }
 }
diff --git a/src/Report/ReportHeader.php b/src/Report/ReportHeader.php
@@ -180,6 +180,7 @@ private function outputDescription(): void
         if (null === $description) {
             return;
         }
+
         $this->applySmallStyle();
         $this->parent->multiCell(
             height: self::SMALL_HEIGHT,
@@ -253,14 +254,15 @@ private function outputText(
         PdfMove $move = PdfMove::RIGHT,
         string|int|null $link = null
     ): void {
+        $text ??= '';
         $this->parent->cell(
             width: $width,
             height: $height,
-            text: $text ?? '',
+            text: $text,
             border: $border,
             move: $move,
             align: $align,
-            link: $link
+            link: '' !== $text ? $link : null
         );
     }
 

diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock