Removed HTML margins. Updated reports.

laurentmuller · Feb 5, 2025 · 173d827 · 173d827
1 parent 97c5d47
commit 173d827
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 217 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Pdf/Html/HtmlMargins.php b/src/Pdf/Html/HtmlMargins.php
diff --git a/src/Report/AbstractReport.php b/src/Report/AbstractReport.php
@@ -55,7 +55,7 @@ public function __construct(
         PdfOrientation $orientation = PdfOrientation::PORTRAIT
     ) {
         parent::__construct($orientation);
-        $this->setAutoPageBreak(true, $this->bottomMargin - self::LINE_HEIGHT)
+        $this->setAutoPageBreak(true, $this->getBottomMargin() - self::LINE_HEIGHT)
             ->setLayout(PdfLayout::SINGLE_PAGE)
             ->setZoom(PdfZoom::FULL_PAGE);
 

diff --git a/src/Report/CalculationByMonthReport.php b/src/Report/CalculationByMonthReport.php
@@ -273,7 +273,7 @@ private function renderChart(array $entities): void
     {
         $h = 100;
         $newPage = \count($entities) > 12;
-        $top = $this->topMargin + $this->getHeader()->getHeight();
+        $top = $this->getTopMargin() + $this->getHeader()->getHeight();
         if ($newPage) {
             $h = $this->pageBreakTrigger - $top - 2.0 * self::LINE_HEIGHT;
         }

diff --git a/src/Report/CalculationByStateReport.php b/src/Report/CalculationByStateReport.php
@@ -215,7 +215,7 @@ private function renderChart(array $entities): void
     {
         $margin = $this->getLeftMargin();
         $printableWidth = $this->getPrintableWidth();
-        $top = $this->topMargin + $this->getHeader()->getHeight() + self::LINE_HEIGHT;
+        $top = $this->getTopMargin() + $this->getHeader()->getHeight() + self::LINE_HEIGHT;
         $radius = $printableWidth / 4.0;
         $centerX = $margin + $printableWidth / 2.0;
         $centerY = $top + $radius;

diff --git a/src/Report/CommandsReport.php b/src/Report/CommandsReport.php
@@ -242,14 +242,14 @@ private function renderOptions(array $options, float $width): void
     private function renderStyledHelp(string $help): void
     {
         // margin
-        $oldMargin = $this->leftMargin;
-        $this->leftMargin = $this->x;
+        $oldMargin = $this->getLeftMargin();
+        $this->setLeftMargin($this->x);
 
         // find classes
         $help = \str_replace(' target="_blank" rel="noopener noreferrer"', '', $help);
         if (!StringUtils::pregMatchAll(self::CLASS_PATTERN, $help, $matches, \PREG_SET_ORDER | \PREG_OFFSET_CAPTURE)) {
             $this->outputHelp($help);
-            $this->leftMargin = $oldMargin;
+            $this->setLeftMargin($oldMargin);
             $this->lineBreak();
 
             return;
@@ -279,7 +279,7 @@ private function renderStyledHelp(string $help): void
         }
 
         // restore
-        $this->leftMargin = $oldMargin;
+        $this->setLeftMargin($oldMargin);
         $this->lineBreak();
     }
 

diff --git a/src/Report/HtmlReport.php b/src/Report/HtmlReport.php
@@ -75,7 +75,8 @@ public function render(): bool
      */
     public function updateLeftMargin(float $leftMargin): self
     {
-        $this->x = $this->leftMargin = $leftMargin;
+        $this->setLeftMargin($leftMargin);
+        $this->x = $leftMargin;
 
         return $this;
     }
@@ -87,7 +88,7 @@ public function updateLeftMargin(float $leftMargin): self
      */
     public function updateRightMargin(float $rightMargin): self
     {
-        $this->rightMargin = $rightMargin;
+        $this->setRightMargin($rightMargin);
 
         return $this;
     }
@@ -99,8 +100,8 @@ protected function beginPage(
     ): void {
         parent::beginPage($orientation, $size, $rotation);
         if (1 === $this->page) {
-            $this->defaultLeftMargin = $this->leftMargin;
-            $this->defaultRightMargin = $this->rightMargin;
+            $this->defaultLeftMargin = $this->getLeftMargin();
+            $this->defaultRightMargin = $this->getRightMargin();
         }
     }
 
@@ -111,13 +112,13 @@ protected function beginPage(
      */
     private function applyDefaultMargins(): array
     {
-        $leftMargin = $this->leftMargin;
-        $rightMargin = $this->rightMargin;
+        $leftMargin = $this->getLeftMargin();
+        $rightMargin = $this->getRightMargin();
         if (null !== $this->defaultLeftMargin && $this->defaultLeftMargin !== $leftMargin) {
             $this->x = $this->defaultLeftMargin;
         }
         if (null !== $this->defaultRightMargin && $this->defaultRightMargin !== $rightMargin) {
-            $this->rightMargin = $this->defaultRightMargin;
+            $this->setRightMargin($this->defaultRightMargin);
         }
 
         return [$leftMargin, $rightMargin];
@@ -130,11 +131,12 @@ private function applyDefaultMargins(): array
      */
     private function applyPreviousMargins(array $previousMargins): void
     {
-        if ($previousMargins[0] !== $this->leftMargin) {
-            $this->leftMargin = $this->x = $previousMargins[0];
+        if ($previousMargins[0] !== $this->getLeftMargin()) {
+            $this->setLeftMargin($previousMargins[0]);
+            $this->x = $previousMargins[0];
         }
-        if ($previousMargins[1] !== $this->rightMargin) {
-            $this->rightMargin = $previousMargins[1];
+        if ($previousMargins[1] !== $this->getRightMargin()) {
+            $this->setRightMargin($previousMargins[1]);
         }
     }
 

diff --git a/src/Report/MemoryImageReport.php b/src/Report/MemoryImageReport.php
@@ -284,7 +284,7 @@ private function renderImages(string $title, array $files, bool $color): void
                 $this->getLevelColor($name)?->apply($this);
             }
             $bounds = new PdfRectangle(
-                $this->leftMargin,
+                $this->getLeftMargin(),
                 $this->y,
                 $this->getPrintableWidth(),
                 self::LINE_HEIGHT,

diff --git a/tests/Pdf/Html/HtmlMarginsTest.php b/tests/Pdf/Html/HtmlMarginsTest.php