v2

Respect · Dec 27, 2024 · fdf13fd · fdf13fd
1 parent fb2ec79
commit fdf13fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/library/Message/StandardFormatter.php b/library/Message/StandardFormatter.php
@@ -42,7 +42,7 @@ public function main(Result $result, array $templates, Translator $translator):
         $selectedTemplates = $this->selectTemplates($result, $templates);
         if (!$this->isFinalTemplate($result, $selectedTemplates)) {
             foreach ($this->extractDeduplicatedChildren($result) as $child) {
-                if ($result->path !== null && $child->path !== null) {
+                if ($result->path !== null && $child->path !== null && $child->path !== $result->path) {
                     $child = $child->withPath(sprintf('%s.%s', $result->path, $child->path));
                 } elseif ($result->path !== null && $child->path === null) {
                     $child = $child->withPath($result->path);

diff --git a/library/Result.php b/library/Result.php
@@ -112,7 +112,14 @@ public function withIdFrom(Rule $rule): self
 
     public function withPath(string|int $path): self
     {
-        return $this->clone(adjacent: $this->adjacent?->withPath($path), path: $path);
+        if ($this->path === $path) {
+            return $this;
+        }
+
+        return $this->clone(
+            adjacent: $this->adjacent?->withPath($path),
+            path: $this->path === null ? $path : $path . '.' . $this->path,
+    );
     }
 
     public function withPrefix(string $prefix): self