More Coverage

Author: oleibman

phpstan-baseline.neon

@@ -390,11 +390,6 @@ parameters:
 			count: 2
 			path: src/PhpWord/Shared/ZipArchive.php
 
-		-
-			message: "#^Call to method addFromString\\(\\) on an unknown class PclZip\\.$#"
-			count: 1
-			path: src/PhpWord/Shared/ZipArchive.php
-
 		-
 			message: "#^Call to method close\\(\\) on an unknown class PclZip\\.$#"
 			count: 1
@@ -1340,11 +1335,6 @@ parameters:
 			count: 2
 			path: tests/PhpWordTests/TemplateProcessorTest.php
 
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:AddFromString\\(\\)\\.$#"
-			count: 1
-			path: tests/PhpWordTests/TemplateProcessorTest.php
-
 		-
 			message: "#^Cannot access offset 'end' on array\\<int\\>\\|bool\\.$#"
 			count: 2

phpstan-baseline.php7.neon

@@ -375,11 +375,6 @@ parameters:
 			count: 2
 			path: src/PhpWord/Shared/ZipArchive.php
 
-		-
-			message: "#^Call to method addFromString\\(\\) on an unknown class PclZip\\.$#"
-			count: 1
-			path: src/PhpWord/Shared/ZipArchive.php
-
 		-
 			message: "#^Call to method close\\(\\) on an unknown class PclZip\\.$#"
 			count: 1
@@ -1310,11 +1305,6 @@ parameters:
 			count: 2
 			path: tests/PhpWordTests/TemplateProcessorTest.php
 
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:AddFromString\\(\\)\\.$#"
-			count: 1
-			path: tests/PhpWordTests/TemplateProcessorTest.php
-
 		-
 			message: "#^Cannot access offset 'end' on array\\<int\\>\\|bool\\.$#"
 			count: 2

phpstan-baseline.php73.neon

@@ -375,11 +375,6 @@ parameters:
 			count: 2
 			path: src/PhpWord/Shared/ZipArchive.php
 
-		-
-			message: "#^Call to method addFromString\\(\\) on an unknown class PclZip\\.$#"
-			count: 1
-			path: src/PhpWord/Shared/ZipArchive.php
-
 		-
 			message: "#^Call to method close\\(\\) on an unknown class PclZip\\.$#"
 			count: 1
@@ -1310,11 +1305,6 @@ parameters:
 			count: 2
 			path: tests/PhpWordTests/TemplateProcessorTest.php
 
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:AddFromString\\(\\)\\.$#"
-			count: 1
-			path: tests/PhpWordTests/TemplateProcessorTest.php
-
 		-
 			message: "#^Cannot access offset 'end' on array\\<int\\>\\|bool\\.$#"
 			count: 2

src/PhpWord/Shared/ZipArchive.php

@@ -236,7 +236,6 @@ public function getFromName($filename)
      */
     public function pclzipAddFile($filename, $localname = null)
     {
-        /** @var PclZip $zip Type hint */
         $zip = $this->zip;
 
         // Bugfix GH-261 https://github.com/PHPOffice/PHPWord/pull/261
@@ -267,8 +266,10 @@ public function pclzipAddFile($filename, $localname = null)
         if (!$this->usePclzip) {
             $pathAdded = $pathAdded . '/' . ltrim(str_replace('\\', '/', substr($filename, strlen($pathRemoved))), '/');
             //$res = $zip->addFile($filename, $pathAdded);
-            $res = $zip->addFromString($pathAdded, file_get_contents($filename));       // addFile can't use subfolders in some cases
+            /** @var \ZipArchive $zip */
+            $res = $zip->addFromString($pathAdded, (string) file_get_contents($filename));       // addFile can't use subfolders in some cases
         } else {
+            /** @var PclZip $zip */
             $res = $zip->add($filename, PCLZIP_OPT_REMOVE_PATH, $pathRemoved, PCLZIP_OPT_ADD_PATH, $pathAdded);
         }
 

tests/PhpWordTests/TemplateProcessorTest.php

@@ -96,7 +96,7 @@ public function xtestTemplateCanBeSavedInTemporaryLocation(string $templateFqfn,
         }
 
         $embeddingText = 'The quick Brown Fox jumped over the lazy^H^H^H^Htired unitTester';
-        $templateProcessor->zip()->AddFromString('word/embeddings/fox.bin', $embeddingText);
+        $templateProcessor->zip()->addFromString('word/embeddings/fox.bin', $embeddingText);
         $documentFqfn = $templateProcessor->save();
 
         self::assertNotEmpty($documentFqfn, 'FQFN of the saved document is empty.');
@@ -855,6 +855,7 @@ public function testSetCheckboxWithCustomMacro(): void
 
     /**
      * @covers ::setImageValue
+     * @covers \PhpOffice\PhpWord\Shared\ZipArchive::pclzipAddFile
      */
     public function testSetImageValue(): void
     {