Reorganized tests for ZugferdDocumentPdfBuilder

horstoeko · Nov 1, 2024 · f133197 · f133197
1 parent de81d98
commit f133197
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/src/ZugferdDocumentPdfBuilderAbstract.php b/src/ZugferdDocumentPdfBuilderAbstract.php
@@ -540,8 +540,6 @@ private function isFile($pdfData): bool
     {
         try {
             return @is_file($pdfData);
-        } catch (TypeError $ex) {
-            return false;
         } catch (Throwable $ex) {
             return false;
         }

diff --git a/tests/testcases/PdfBuilderEn16931Test.php b/tests/testcases/PdfBuilderEn16931Test.php
@@ -11,7 +11,6 @@
 use horstoeko\zugferd\ZugferdDocumentBuilder;
 use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
 use horstoeko\zugferd\ZugferdDocumentPdfBuilderAbstract;
-use horstoeko\zugferd\ZugferdPackageVersion;
 use horstoeko\zugferd\ZugferdProfiles;
 use setasign\Fpdi\PdfParser\PdfParserException;
 use setasign\Fpdi\PdfParser\StreamReader;
@@ -106,6 +105,19 @@ public function testBuildFromSourcePdfFile(): void
         $pdfBuilder->saveDocument(self::$destPdfFilename);
 
         $this->assertFileExists(self::$destPdfFilename);
+
+        ob_start();
+        $pdfBuilder->saveDocumentInline(self::$destPdfFilename);
+        $pdfContent = ob_get_clean();
+
+        $this->assertIsString($pdfContent);
+        $this->assertNotEquals('', $pdfContent);
+
+        $pdfContent = $pdfBuilder->downloadString(self::$destPdfFilename);
+
+        $this->assertIsString($pdfContent);
+        $this->assertNotEquals('', $pdfContent);
+        $this->assertStringStartsNotWith('%PDF-1.4', $pdfContent);
     }
 
     public function testBuildFromSourcePdfStringWhichIsInvalid(): void
@@ -121,11 +133,26 @@ public function testBuildFromSourcePdfStringWhichIsInvalid(): void
 
     public function testBuildFromSourcePdfString(): void
     {
-        $pdfBuilder = new ZugferdDocumentPdfBuilder(self::$document, self::$sourcePdfFilename);
+        $pdfContent = file_get_contents(self::$sourcePdfFilename);
+
+        $pdfBuilder = new ZugferdDocumentPdfBuilder(self::$document, $pdfContent);
         $pdfBuilder->generateDocument();
-        $pdfBuilder->downloadString(self::$destPdfFilename);
+        $pdfBuilder->saveDocument(self::$destPdfFilename);
+
+        $this->assertFileExists(self::$destPdfFilename);
+
+        ob_start();
+        $pdfBuilder->saveDocumentInline(self::$destPdfFilename);
+        $pdfContent = ob_get_clean();
+
+        $this->assertIsString($pdfContent);
+        $this->assertNotEquals('', $pdfContent);
+
+        $pdfContent = $pdfBuilder->downloadString(self::$destPdfFilename);
 
-        $this->assertIsString(self::$destPdfFilename);
+        $this->assertIsString($pdfContent);
+        $this->assertNotEquals('', $pdfContent);
+        $this->assertStringStartsNotWith('%PDF-1.4', $pdfContent);
     }
 
     public function testPdfMetaData(): void