Merge pull request #19 from LibreSign/copilot/fix-composer-mutation-test-issues

Fix remaining CI failures in PDF exporter test coverage branch

Author: vitormattos

src/Layout/TextLineBreaker.php

@@ -65,7 +65,7 @@ public function wrap(
             $lines[] = $currentLine;
         }
 
-        return $lines === [] ? [$text] : $lines;
+        return $lines;
     }
 
     private function fitsOnCurrentLine(
@@ -98,14 +98,9 @@ private function appendBrokenWord(
         string &$currentLine,
     ): void {
         $segments = $this->breakWord($word, $maxWidth, $fontAlias, $fontSize, $hyphens);
-        $lastIndex = count($segments) - 1;
-
-        foreach ($segments as $index => $segment) {
-            if ($index === $lastIndex) {
-                $currentLine = $segment;
-                continue;
-            }
+        $currentLine = array_pop($segments) ?? '';
 
+        foreach ($segments as $segment) {
             $lines[] = $segment;
         }
     }
@@ -120,7 +115,7 @@ private function breakWord(
         float $fontSize,
         string $hyphens,
     ): array {
-        if ($hyphens === 'none') {
+        if ($hyphens === 'none' || ($hyphens !== 'manual' && $hyphens !== 'auto')) {
             return [$word];
         }
 
@@ -129,10 +124,6 @@ private function breakWord(
             return $manualSegments;
         }
 
-        if ($hyphens !== 'auto') {
-            return [$word];
-        }
-
         return $this->breakWordAutomatically($word, $maxWidth, $fontAlias, $fontSize);
     }
 
@@ -146,15 +137,17 @@ private function resolveManualBreaks(
         float $fontSize,
         string $hyphens,
     ): ?array {
-        if ($hyphens !== 'manual' || !str_contains($word, "\u{00AD}")) {
+        if ($hyphens !== 'manual') {
+            return null;
+        }
+
+        if (!str_contains($word, "\u{00AD}")) {
             return null;
         }
 
         $manualBreaks = explode("\u{00AD}", $word);
 
-        return count($manualBreaks) > 1
-            ? $this->packManualSegments($manualBreaks, $maxWidth, $fontAlias, $fontSize)
-            : null;
+        return $this->packManualSegments($manualBreaks, $maxWidth, $fontAlias, $fontSize);
     }
 
     /**
@@ -166,64 +159,67 @@ private function breakWordAutomatically(
         string $fontAlias,
         float $fontSize,
     ): array {
+        $characters = $this->splitCharacters($word);
+        if ($characters === []) {
+            return [$word];
+        }
+
         $segments = [];
-        $remaining = $this->splitCharacters($word);
+        $hyphenWidth = $this->fontMetrics->measureString($fontAlias, $fontSize, '-');
+        $offset = 0;
+        $characterCount = count($characters);
 
-        while ($remaining !== []) {
-            ['segment' => $segment, 'consumed' => $consumed] = $this->resolveAutoSegment(
-                $remaining,
+        while (isset($characters[$offset])) {
+            $segment = $this->resolveAutoSegment(
+                array_slice($characters, $offset),
                 $maxWidth,
                 $fontAlias,
                 $fontSize,
+                $hyphenWidth,
             );
 
-            if ($consumed <= 0) {
-                break;
-            }
-
-            $remaining = array_slice($remaining, $consumed);
-            $segments[] = $remaining === [] ? $segment : ($segment . '-');
+            $segmentCharacters = $this->splitCharacters($segment);
+            $fallbackCount = count($this->splitCharacters($characters[$offset]));
+            $consumedCount = max(count($segmentCharacters) + $fallbackCount - 1, $fallbackCount);
+            $offset = min($offset + $consumedCount, $characterCount);
+            $segments[] = !isset($characters[$offset]) ? $segment : ($segment . '-');
         }
 
-        return $segments === [] ? [$word] : $segments;
+        return $segments;
     }
 
     /**
      * @param list<string> $remaining
-     * @return array{segment: string, consumed: int}
+     * @return string
      */
     private function resolveAutoSegment(
         array $remaining,
         float $maxWidth,
         string $fontAlias,
         float $fontSize,
-    ): array {
+        float $hyphenWidth,
+    ): string {
         $segment = '';
-        $consumed = 0;
         $remainingCount = count($remaining);
 
         foreach ($remaining as $index => $character) {
             $candidate = $segment . $character;
-            $isLastCharacter = $index === ($remainingCount - 1);
-            $candidateWidth = $this->fontMetrics->measureString(
-                $fontAlias,
-                $fontSize,
-                $candidate . ($isLastCharacter ? '' : '-'),
-            );
+            $hasMoreCharacters = ($index + 1) < $remainingCount;
+            $candidateWidth = $this->fontMetrics->measureString($fontAlias, $fontSize, $candidate)
+                + ($hasMoreCharacters ? $hyphenWidth : 0.0);
 
             if ($candidateWidth > $maxWidth && $segment !== '') {
                 break;
             }
 
             if ($candidateWidth > $maxWidth) {
-                return ['segment' => $character, 'consumed' => 1];
+                return $character;
             }
 
             $segment = $candidate;
-            $consumed = $index + 1;
         }
 
-        return ['segment' => $segment, 'consumed' => $consumed];
+        return $segment;
     }
 
     /**
@@ -239,13 +235,15 @@ private function packManualSegments(
         $packed = [];
         $current = '';
         $lastIndex = count($segments) - 1;
+        $hyphenWidth = $this->fontMetrics->measureString($fontAlias, $fontSize, '-');
 
         foreach ($segments as $index => $segment) {
             $candidate = $current . $segment;
-            $candidateWithHyphen = $candidate . ($index === $lastIndex ? '' : '-');
+            $candidateWidth = $this->fontMetrics->measureString($fontAlias, $fontSize, $candidate)
+                + ($index === $lastIndex ? 0.0 : $hyphenWidth);
             if (
                 $current !== ''
-                && $this->fontMetrics->measureString($fontAlias, $fontSize, $candidateWithHyphen) > $maxWidth
+                && $candidateWidth > $maxWidth
             ) {
                 $packed[] = $current . '-';
                 $current = $segment;

src/Layout/TextOverflowTruncator.php

@@ -36,15 +36,13 @@ public function forceEllipsis(
         float $fontSize,
     ): string {
         $ellipsis = '...';
+        $ellipsisWidth = $this->fontMetrics->measureString($fontAlias, $fontSize, $ellipsis);
         $characters = $this->splitCharacters($text);
 
-        while ($characters !== []) {
-            $candidate = implode('', $characters) . $ellipsis;
-            if ($this->fontMetrics->measureString($fontAlias, $fontSize, $candidate) <= $maxWidth) {
-                return rtrim(implode('', $characters)) . $ellipsis;
+        foreach ($this->buildCandidates($characters) as $candidate) {
+            if (($this->fontMetrics->measureString($fontAlias, $fontSize, $candidate) + $ellipsisWidth) <= $maxWidth) {
+                return rtrim($candidate) . $ellipsis;
             }
-
-            array_pop($characters);
         }
 
         return $ellipsis;
@@ -59,4 +57,21 @@ private function splitCharacters(string $text): array
 
         return $characters === false ? [] : $characters;
     }
+
+    /**
+     * @param list<string> $characters
+     * @return list<string>
+     */
+    private function buildCandidates(array $characters): array
+    {
+        $candidates = [];
+        $candidate = '';
+
+        foreach ($characters as $character) {
+            $candidate .= $character;
+            $candidates[] = $candidate;
+        }
+
+        return array_reverse($candidates);
+    }
 }

src/Pdf/FilesystemImageSourceReader.php

@@ -0,0 +1,47 @@
+<?php
+
+// SPDX-FileCopyrightText: 2026 LibreSign
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace LibreSign\XObjectTemplate\Pdf;
+
+use InvalidArgumentException;
+
+/** @internal */
+final readonly class FilesystemImageSourceReader implements FilesystemImageSourceReaderInterface
+{
+    private WarningToExceptionConverterInterface $warningConverter;
+
+    public function __construct(?WarningToExceptionConverterInterface $warningConverter = null)
+    {
+        $this->warningConverter = $warningConverter ?? new PhpWarningToExceptionConverter();
+    }
+
+    public function read(string $source): string
+    {
+        $this->assertReadableSource($source);
+
+        $contents = $this->warningConverter->run(
+            static fn (): string|false => file_get_contents($source),
+            sprintf('Failed to read image source "%s".', $source),
+        );
+        if (!is_string($contents)) {
+            throw new InvalidArgumentException(sprintf('Failed to read image source "%s".', $source));
+        }
+
+        return $contents;
+    }
+
+    private function assertReadableSource(string $source): void
+    {
+        if (!is_file($source)) {
+            throw new InvalidArgumentException(sprintf('Image source "%s" must be an existing file.', $source));
+        }
+
+        if (!is_readable($source)) {
+            throw new InvalidArgumentException(sprintf('Image source "%s" must be readable.', $source));
+        }
+    }
+}

src/Pdf/FilesystemImageSourceReaderInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+// SPDX-FileCopyrightText: 2026 LibreSign
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace LibreSign\XObjectTemplate\Pdf;
+
+/** @internal */
+interface FilesystemImageSourceReaderInterface
+{
+    public function read(string $source): string;
+}