LibreSign · vitormattos · May 28, 2026 · May 28, 2026 · May 28, 2026 · May 28, 2026
@@ -12,8 +12,8 @@
   "phpUnit": {
     "customPath": "vendor-bin/phpunit/vendor/bin/phpunit"
   },
-  "minMsi": 70,
-  "minCoveredMsi": 80,
+  "minMsi": 75,
+  "minCoveredMsi": 82,
   "testFramework": "phpunit",
   "timeout": 10
 }
@@ -6,15 +6,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 https://pmd.github.io/pmd-6.55.0/ruleset_xml_schema.xsd">
   <description>PHPMD baseline ruleset.</description>
-  <rule ref="rulesets/cleancode.xml">
-    <exclude name="ErrorControlOperator"/>
-  </rule>
-  <rule ref="rulesets/codesize.xml">
-    <exclude name="CyclomaticComplexity"/>
-    <exclude name="NPathComplexity"/>
-  </rule>
+  <rule ref="rulesets/cleancode.xml"/>
+  <rule ref="rulesets/codesize.xml"/>
+  <exclude-pattern>*tests/*</exclude-pattern>
   <rule ref="rulesets/design.xml"/>
   <rule ref="rulesets/naming.xml">
     <exclude name="ShortVariable"/>
   </rule>
+  <rule ref="rulesets/naming.xml/ShortVariable">
+    <properties>
+      <property name="exceptions" value="x,y"/>
+    </properties>
+  </rule>
 </ruleset>
@@ -14,6 +14,9 @@
 
 final class SubsetHtmlParser
 {
+    private const HTML_WRAPPER = '<?xml encoding="utf-8" ?><body>%s</body>';
+    private const LIBXML_HTML_PARSE_FLAGS = 96; // LIBXML_NOERROR | LIBXML_NOWARNING
+
     /** @var array<string, true> */
     private array $allowedTags = [
         'div' => true,
@@ -31,14 +34,14 @@ public function parse(string $html): array
         $dom = new DOMDocument('1.0', 'UTF-8');
         $prevLibxmlErrors = libxml_use_internal_errors(true);
         $dom->loadHTML(
-            '<?xml encoding="utf-8" ?><body>' . $html . '</body>',
-            LIBXML_NOERROR | LIBXML_NOWARNING,
+            sprintf(self::HTML_WRAPPER, $html),
+            self::LIBXML_HTML_PARSE_FLAGS,
         );
         libxml_clear_errors();
         libxml_use_internal_errors($prevLibxmlErrors);
 
         $body = $dom->getElementsByTagName('body')->item(0);
-        if (!$body instanceof DOMElement) {
+        if ($body === null) {
             return [];
         }
 
@@ -64,13 +67,14 @@ private function parseDomNode(DOMNode $node, string $inheritedStyle): ?Node
 
     private function parseElementNode(DOMElement $node, string $inheritedStyle): Node
     {
-        $tag = strtolower($node->tagName);
+        $tag = $node->tagName;
         if (!isset($this->allowedTags[$tag])) {
             throw new UnsupportedSubsetException(sprintf('Tag <%s> is not supported.', $tag));
         }
 
         $attributes = $this->collectAttributes($node);
         $effectiveStyle = $this->mergeStyle($inheritedStyle, $attributes['style'] ?? '');
+        unset($attributes['style']);
         if ($effectiveStyle !== '') {
             $attributes['style'] = $effectiveStyle;
         }
@@ -112,22 +116,18 @@ private function parseTextNode(DOMNode $node, string $inheritedStyle): ?Node
     private function collectAttributes(DOMElement $node): array
     {
         $attributes = [];
-        if ($node->attributes === null) {
-            return $attributes;
-        }
-
-        foreach ($node->attributes as $attribute) {
-            $attributes[strtolower($attribute->name)] = $attribute->value;
+        $nodeAttrs = $node->attributes;
+        if ($nodeAttrs !== null) {
+            foreach ($nodeAttrs as $attribute) {
+                $attributes[$attribute->name] = trim($attribute->value);
+            }
         }
 
         return $attributes;
     }
 
     private function mergeStyle(string $inheritedStyle, string $ownStyle): string
     {
-        $inheritedStyle = trim($inheritedStyle);
-        $ownStyle = trim($ownStyle);
-
         if ($inheritedStyle === '') {
             return $ownStyle;
         }

@@ -33,31 +33,28 @@ public function layout(array $nodes, float $width, float $height): LayoutResult
 
         foreach ($this->walk($nodes) as $node) {
             $style = $this->styleParser->parse($node->attributes['style'] ?? '');
-            $margin = $this->parseBoxSpacing((string) $style->get('margin', '0'));
-            $padding = $this->parseBoxSpacing((string) $style->get('padding', '0'));
+            $margin = $this->parseBoxSpacing($this->styleValue($style, 'margin', '0'));
+            $padding = $this->parseBoxSpacing($this->styleValue($style, 'padding', '0'));
 
             $cursorY -= ($margin['top'] + $padding['top']);
 
-            $fontSize = $this->toPoints((string) $style->get('font-size', '10'));
-            $lineHeight = max(
-                $fontSize * 1.2,
-                $this->toPoints((string) $style->get('line-height', (string) ($fontSize * 1.2))),
-            );
+            $fontSize = $this->toPoints($this->styleValue($style, 'font-size', '10'));
+            $lineHeight = $this->resolveLineHeight($style, $fontSize);
             $fontAlias = $this->resolveFontAlias(
-                (string) $style->get('font-family', 'helvetica'),
-                (string) $style->get('font-weight', 'normal'),
+                $this->styleValue($style, 'font-family', 'helvetica'),
+                $this->styleValue($style, 'font-weight', 'normal'),
             );
 
-            $boxWidth = $this->toPoints((string) $style->get('width', '0'));
+            $boxWidth = $this->toPoints($this->styleValue($style, 'width', '0'));
             if ($boxWidth <= 0) {
                 $boxWidth = max($width - $margin['left'] - $margin['right'] - $padding['left'] - $padding['right'], 0);
             }
             $leftBase = $margin['left'] + $padding['left'];
             $rightBase = $leftBase + $boxWidth;
 
             if ($node->tag === 'img') {
-                $imgWidth = $this->toPoints((string) $style->get('width', '32'));
-                $imgHeight = $this->toPoints((string) $style->get('height', '32'));
+                $imgWidth = $this->toPoints($this->styleValue($style, 'width', '32'));
+                $imgHeight = $this->toPoints($this->styleValue($style, 'height', '32'));
                 if ($imgWidth <= 0) {
                     $imgWidth = 32.0;
                 }
@@ -88,20 +85,20 @@ public function layout(array $nodes, float $width, float $height): LayoutResult
                 continue;
             }
 
-            $align = strtolower((string) $style->get('text-align', 'left'));
-            $x = match ($align) {
+            $align = strtolower($this->styleValue($style, 'text-align', 'left'));
+            $lineX = match ($align) {
                 'center' => $leftBase + ($boxWidth / 2.0),
                 'right' => max($rightBase - 8.0, 0),
                 default => $leftBase + 8.0,
             };
 
             $lines[] = new LayoutLine(
                 text: $text,
-                x: $x,
+                x: $lineX,
                 y: max($cursorY, 0),
                 fontSize: $fontSize,
                 fontAlias: $fontAlias,
-                rgbColor: (string) $style->get('color', '#000000'),
+                rgbColor: $this->styleValue($style, 'color', '#000000'),
             );
 
             $cursorY -= ($lineHeight + $margin['bottom'] + $padding['bottom']);
@@ -110,17 +107,33 @@ public function layout(array $nodes, float $width, float $height): LayoutResult
         return new LayoutResult(lines: $lines, images: $images);
     }
 
+    private function styleValue(
+        \LibreSign\XObjectTemplate\Css\StyleMap $style,
+        string $property,
+        string $default,
+    ): string {
+        return $style->get($property, $default) ?? $default;
+    }
+
     /**
      * @param list<Node> $nodes
      * @return list<Node>
      */
     private function walk(array $nodes): array
     {
         $result = [];
-        foreach ($nodes as $node) {
+        $stack = array_reverse($nodes);
+
+        while ($stack !== []) {
+            $node = array_pop($stack);
             $result[] = $node;
-            if ($node->children !== []) {
-                $result = [...$result, ...$this->walk($node->children)];
+
+            if ($node->children === []) {
+                continue;
+            }
+
+            foreach (array_reverse($node->children) as $child) {
+                $stack[] = $child;
             }
         }
 
@@ -129,11 +142,7 @@ private function walk(array $nodes): array
 
     private function toPoints(string $value): float
     {
-        $normalized = trim(strtolower($value));
-        if ($normalized === '') {
-            return 0.0;
-        }
-
+        $normalized = strtolower($value);
         $number = (float) preg_replace('/[^0-9.\-]/', '', $normalized);
         if (str_ends_with($normalized, 'px')) {
             return $number * 0.75;
@@ -142,13 +151,27 @@ private function toPoints(string $value): float
         return $number;
     }
 
+    private function resolveLineHeight(
+        \LibreSign\XObjectTemplate\Css\StyleMap $style,
+        float $fontSize,
+    ): float {
+        $defaultLineHeight = $fontSize * 1.2;
+        $configuredLineHeight = $this->styleValue($style, 'line-height', '');
+
+        if ($configuredLineHeight === '') {
+            return $defaultLineHeight;
+        }
+
+        return max($defaultLineHeight, $this->toPoints($configuredLineHeight));
+    }
+
     /**
      * @return array{top: float, right: float, bottom: float, left: float}
      */
     private function parseBoxSpacing(string $value): array
     {
-        $tokens = preg_split('/\s+/', trim($value));
-        $tokens = array_values(array_filter($tokens ?: [], static fn (string $token): bool => $token !== ''));
+        preg_match_all('/\S+/', $value, $matches);
+        $tokens = $matches[0];
 
         if ($tokens === []) {
             return ['top' => 0.0, 'right' => 0.0, 'bottom' => 0.0, 'left' => 0.0];
@@ -174,7 +197,7 @@ private function parseBoxSpacing(string $value): array
 
     private function resolveFontAlias(string $fontFamily, string $fontWeight): string
     {
-        $primary = strtolower(trim(explode(',', $fontFamily)[0], " \t\n\r\0\x0B'\""));
+        $primary = strtolower(explode(',', $fontFamily)[0]);
         $isBold = $this->isBoldWeight($fontWeight);
 
         if (str_contains($primary, 'times')) {
@@ -190,13 +213,13 @@ private function resolveFontAlias(string $fontFamily, string $fontWeight): strin
 
     private function isBoldWeight(string $fontWeight): bool
     {
-        $normalized = strtolower(trim($fontWeight));
+        $normalized = strtolower($fontWeight);
         if ($normalized === 'bold' || $normalized === 'bolder') {
             return true;
         }
 
         if (is_numeric($normalized)) {
-            return (int) $normalized >= 600;
+            return $normalized >= 600;
         }
 
         return false;

@@ -20,10 +20,11 @@ public function toPdfRgb(string $hexColor): string
             return '0 0 0 rg';
         }
 
-        $r = round(hexdec(substr($hex, 0, 2)) / 255, 4);
-        $g = round(hexdec(substr($hex, 2, 2)) / 255, 4);
-        $b = round(hexdec(substr($hex, 4, 2)) / 255, 4);
+        $channels = str_split($hex, 2);
+        $redChannel = round(hexdec($channels[0]) / 255, 4);
+        $greenChannel = round(hexdec($channels[1]) / 255, 4);
+        $blueChannel = round(hexdec($channels[2]) / 255, 4);
 
-        return sprintf('%s %s %s rg', $r, $g, $b);
+        return sprintf('%s %s %s rg', $redChannel, $greenChannel, $blueChannel);
     }
 }
@@ -7,6 +7,7 @@
 
 namespace LibreSign\XObjectTemplate\Pdf;
 
+use Closure;
 use LibreSign\XObjectTemplate\Dto\CompileRequest;
 use LibreSign\XObjectTemplate\Dto\CompileResult;
 use LibreSign\XObjectTemplate\Layout\LayoutImage;
@@ -47,14 +48,18 @@
         ],
     ];
 
+    private Closure $clock;
+
     /**
      * @param array<string, array<string, mixed>> $fontResources
      */
     public function __construct(
         private PdfEscaper $pdfEscaper = new PdfEscaper(),
         private ColorParser $colorParser = new ColorParser(),
         private array $fontResources = self::DEFAULT_FONT_RESOURCES,
+        ?Closure $clock = null,
     ) {
+        $this->clock = $clock ?? static fn (): int => hrtime(true);
     }
 
     public function build(
@@ -121,7 +126,7 @@ public function buildResources(LayoutResult $layout): array
     public function buildMetadata(LayoutResult $layout, int $startedAtNs, int $nodeCount = 0): array
     {
         return [
-            'render_ms' => round((hrtime(true) - $startedAtNs) / 1_000_000, 3),
+            'render_ms' => round((($this->clock)() - $startedAtNs) / 1_000_000, 3),
             'line_count' => count($layout->lines),
             'image_count' => count($layout->images),
             'node_count' => $nodeCount,
@@ -130,7 +135,7 @@ public function buildMetadata(LayoutResult $layout, int $startedAtNs, int $nodeC
 
     public function withFontResources(array $fontResources): self
     {
-        return new self($this->pdfEscaper, $this->colorParser, $fontResources);
+        return new self($this->pdfEscaper, $this->colorParser, $fontResources, $this->clock);
     }
 
     private function buildImageCommand(LayoutImage $image): string

@@ -8,6 +8,7 @@
 namespace LibreSign\XObjectTemplate\Tests\Unit\Css;
 
 use LibreSign\XObjectTemplate\Css\InlineStyleParser;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 final class InlineStyleParserTest extends TestCase
@@ -42,5 +43,47 @@ public function testParseSkipsEmptyNameOrValueWithoutStoppingTheLoop(): void
         self::assertSame('red', $map->get('color'));
         self::assertSame('4', $map->get('padding'));
         self::assertNull($map->get('font-size'));
+        self::assertNull($map->get(''));
+    }
+
+    #[DataProvider('invalidChunkProvider')]
+    public function testParseSkipsEachInvalidChunkVariantAndContinuesParsing(
+        string $style,
+        array $expectedPresent,
+        array $expectedAbsent,
+    ): void {
+        $parser = new InlineStyleParser();
+
+        $map = $parser->parse($style);
+
+        foreach ($expectedPresent as $name => $value) {
+            self::assertSame($value, $map->get($name));
+        }
+
+        foreach ($expectedAbsent as $name) {
+            self::assertNull($map->get($name));
+        }
+    }
+
+    /**
+     * @return iterable<string, array{
+     *     style: string,
+     *     expectedPresent: array<string, string>,
+     *     expectedAbsent: list<string>
+     * }>
+     */
+    public static function invalidChunkProvider(): iterable
+    {
+        yield 'empty name does not stop later declarations' => [
+            'style' => ':red; color:blue; padding:1',
+            'expectedPresent' => ['color' => 'blue', 'padding' => '1'],
+            'expectedAbsent' => [''],
+        ];
+
+        yield 'empty value does not stop later declarations' => [
+            'style' => 'font-size:; color:green; margin:2',
+            'expectedPresent' => ['color' => 'green', 'margin' => '2'],
+            'expectedAbsent' => ['font-size'],
+        ];
     }
 }