Changes for consistency

tausiquezilani · Jun 27, 2021 · d6d964b · d6d964b
1 parent 7e221a5
commit d6d964b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Writer/PdfWriter.php b/src/Writer/PdfWriter.php
@@ -70,8 +70,10 @@ public function write(QrCodeInterface $qrCode, LogoInterface $logo = null, Label
             }
         }
 
+        $result = new PdfResult($fpdf);
+
         if ($logo instanceof LogoInterface) {
-            $this->addLogo($logo, $fpdf);
+            $result = $this->addLogo($logo, $result);
         }
 
         if ($label instanceof LabelInterface) {
@@ -80,11 +82,13 @@ public function write(QrCodeInterface $qrCode, LogoInterface $logo = null, Label
             $fpdf->Cell(0, 0, $label->getText(), 0, 0, 'C');
         }
 
-        return new PdfResult($fpdf);
+        return $result;
     }
 
-    private function addLogo(LogoInterface $logo, \FPDF $fpdf): void
+    private function addLogo(LogoInterface $logo, PdfResult $result): PdfResult
     {
+        $fpdf = $result->getPdf();
+
         $logoPath = $logo->getPath();
         $logoHeight = $logo->getResizeToHeight();
         $logoWidth = $logo->getResizeToWidth();
@@ -106,5 +110,7 @@ private function addLogo(LogoInterface $logo, \FPDF $fpdf): void
         $logoY = $fpdf->GetPageHeight() / 2 - (int) $logoHeight / 2;
 
         $fpdf->Image($logoPath, $logoX, $logoY, $logoWidth, $logoHeight);
+
+        return $result;
     }
 }
diff --git a/src/Writer/Result/PdfResult.php b/src/Writer/Result/PdfResult.php
@@ -14,6 +14,11 @@ public function __construct(\FPDF $fpdf)
         $this->fpdf = $fpdf;
     }
 
+    public function getPdf(): \FPDF
+    {
+        return $this->fpdf;
+    }
+
     public function getString(): string
     {
         return $this->fpdf->Output('S');