Fix problem with PDF flushing.

roncemer · Nov 5, 2021 · 0f36c16 · 0f36c16
1 parent 61f175f
commit 0f36c16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/src/Report.php b/src/Report.php
@@ -178,7 +178,6 @@ protected function outputHeading($forceNewPage = false) {
                 $this->outputter->pageNumber++;
                 $newPage = true;
             } else if ($forceNewPage) {
-                $this->outputter->flushPDF();
                 $this->outputter->pdf->AddPage();
                 $this->outputter->pageNumber++;
                 $newPage = true;
@@ -192,7 +191,6 @@ protected function outputHeading($forceNewPage = false) {
                 $hs = $this->outputter->getPDFLineSpacing();
                 // If we can't the headings on the current page, begin a new page.
                 if (($this->outputter->pdf->GetY() + $hs) > $this->outputter->pdf->getPageBreakTrigger()) {
-                    $this->outputter->flushPDF();
                     $this->outputter->pdf->AddPage();
                     $this->outputter->pageNumber++;
                     $newPage = true;

diff --git a/src/ReportOutputter.php b/src/ReportOutputter.php
@@ -218,18 +218,6 @@ public function createPDF() {
         $this->pdfFilePointer = fopen($this->pdfFilename, 'wb');
     }
 
-    public function flushPDF() {
-        if ($this->pdfFilePointer !== false) {
-            if ($this->pdf !== null) {
-                $data = $this->pdf->Output('S');
-                $this->pdf->resetBuffer();
-                if ($data != '') {
-                    fwrite($this->pdfFilePointer, $data, strlen($data));
-                }
-            }
-        }
-    }
-
     public function outputText($text) {
         if ($text != '') {
             if ($this->outputStream !== false) {
@@ -256,9 +244,17 @@ public function finish() {
         case 'pdf':
             if ($this->pdfFilePointer !== false) {
                 if ($this->pdf !== null) $this->pdf->Close();
-                $this->flushPDF();
-                fclose($this->pdfFilePointer);
-                $this->pdfFilePointer = false;
+                if ($this->pdfFilePointer !== false) {
+                    if ($this->pdf !== null) {
+                        $data = $this->pdf->Output('S');
+                        $this->pdf->resetBuffer();
+                        if ($data != '') {
+                            fwrite($this->pdfFilePointer, $data, strlen($data));
+                        }
+                    }
+                    fclose($this->pdfFilePointer);
+                    $this->pdfFilePointer = false;
+                }
             }
             if ($this->pdfUseTempFileForOutput) {
                 $this->output = file_get_contents($this->pdfFilename);