Fix: enhance media file handling to avoid duplicates and update test assertions

Author: Sambit003

src/PhpWord/Writer/WPS/Part/Manifest.php

@@ -70,16 +70,23 @@ private function writeManifestItem(XMLWriter $xmlWriter, string $href, string $m
      */
     private function writeMediaFiles(XMLWriter $xmlWriter): void
     {
-        // Document media
-        $media = Media::getElements('section');
-        if (!empty($media)) {
-            foreach ($media as $medium) {
-                if ($medium['type'] == 'image') {
-                    $this->writeManifestItem(
-                        $xmlWriter,
-                        'Pictures/' . $medium['target'],
-                        $this->getMediaType($medium['target'])
-                    );
+        $mediaParts = ['section', 'header', 'footer'];
+        $writtenTargets = []; // Keep track of written targets to avoid duplicates
+
+        foreach ($mediaParts as $partName) {
+            $media = Media::getElements($partName);
+            if (!empty($media)) {
+                foreach ($media as $medium) {
+                    $targetPath = 'Pictures/' . $medium['target'];
+                    // Only write entry if it hasn't been written yet
+                    if (!isset($writtenTargets[$targetPath]) && $medium['type'] == 'image') {
+                        $this->writeManifestItem(
+                            $xmlWriter,
+                            $targetPath,
+                            $this->getMediaType($medium['target'])
+                        );
+                        $writtenTargets[$targetPath] = true; // Mark as written
+                    }
                 }
             }
         }

tests/PhpWordTests/Writer/WPS/Part/ContentTest.php

@@ -32,10 +32,10 @@ public function testWrite(): void
         self::assertStringContainsString('xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"', $result);
         self::assertStringContainsString('xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"', $result);
         self::assertStringContainsString('xmlns:xlink="http://www.w3.org/1999/xlink"', $result);
-        self::assertStringContainsString('<office:scripts>', $result);
+        self::assertStringContainsString('<office:scripts/>', $result);
         self::assertStringContainsString('<office:font-face-decls>', $result);
         self::assertStringContainsString('<style:font-face style:name="Arial" svg:font-family="Arial"', $result);
-        self::assertStringContainsString('<office:automatic-styles>', $result);
+        self::assertStringContainsString('<office:automatic-styles/>', $result);
         self::assertStringContainsString('<office:body>', $result);
         self::assertStringContainsString('<office:text>', $result);
     }

tests/PhpWordTests/Writer/WPSTest.php

@@ -64,8 +64,7 @@ public function testWithMedia(): void
         $section = $phpWord->addSection();
 
         // Add an image to the document
-        // Correct the relative path and check if realpath returns a valid path
-        $imagePath = realpath(__DIR__ . 'tests/PhpWordTests/_files/images/earth.jpg');
+        $imagePath = realpath('tests/PhpWordTests/_files/images/earth.jpg');
         self::assertIsString($imagePath, 'Test image file not found or accessible at the expected location.'); // Ensure path is valid string
         self::assertFileExists($imagePath, "Test image file not found at: {$imagePath}"); // Use validated path
         $section->addImage($imagePath); // Use validated path
@@ -91,7 +90,7 @@ public function testWithMedia(): void
 
         // Verify the Pictures directory exists and contains images
         self::assertTrue($zip->locateName('Pictures/') !== false, "'Pictures/' directory not found in ZIP.");
-        self::assertTrue($zip->locateName('Pictures/earth.jpg') !== false, "'earth.jpg' not found in 'Pictures/' directory.");
+        self::assertTrue($zip->locateName('Pictures/image1.jpg') !== false, "'Pictures/image1.jpg' not found in ZIP.");
 
         $zip->close();
         unlink($tempFile);