Fix compile-time processing

nepada · Aug 1, 2022 · 30d9225 · 30d9225
1 parent 10c689f
commit 30d9225
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 2 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -26,7 +26,11 @@ parameters:
             - Nette\MemberAccessException
 
     ignoreErrors:
-        -
+        - # false positive
             message: "#^Parameter \\#1 \\$value of method Generator\\<int,array\\|null,array\\<int, Latte\\\\Compiler\\\\Nodes\\\\AreaNode\\|Latte\\\\Compiler\\\\Tag\\|null\\>,Nepada\\\\Bridges\\\\TexyLatte\\\\TexyNode\\>\\:\\:send\\(\\) expects array\\{Latte\\\\Compiler\\\\Nodes\\\\AreaNode, Latte\\\\Compiler\\\\Tag\\|null\\}, mixed given\\.$#"
             count: 1
             path: src/Bridges/TexyLatte/TexyNode.php
+        - # false positive
+            message: "#^Instanceof between Nepada\\\\Bridges\\\\TexyLatte\\\\TexyNode and Nepada\\\\Bridges\\\\TexyLatte\\\\TexyNode will always evaluate to true\\.$#"
+            count: 1
+            path: src/Bridges/TexyLatte/TexyNode.php
diff --git a/src/Bridges/TexyLatte/TexyNode.php b/src/Bridges/TexyLatte/TexyNode.php
@@ -27,7 +27,9 @@ public static function create(Tag $tag, TemplateParser $parser, callable $proces
         $parent->current();
         $parent->send(yield); // phpcs:ignore
         $node = $parent->getReturn();
-        $node->tagName = $tag->name;
+        if ($node instanceof self) {
+            $node->tagName = $tag->name;
+        }
         return $node;
     }
 

diff --git a/tests/Bridges/fixtures/tags.custom-mode.html b/tests/Bridges/fixtures/tags.custom-mode.html
@@ -1,4 +1,6 @@
 
+<p>Simple block…</p>
+
 <p>Texy Block &lt;br&gt;</p>
 
 <p>&lt;span title=„&lt;br&gt;“&gt;example@example.com &amp; <a

diff --git a/tests/Bridges/fixtures/tags.custom-mode.latte b/tests/Bridges/fixtures/tags.custom-mode.latte
@@ -1,5 +1,9 @@
 {var $tag = '<br>'}
 
+{texy}
+    Simple block...
+{/texy}
+
 {texy custom}
     Texy Block {$tag}
 

diff --git a/tests/Bridges/fixtures/tags.custom-mode.phtml b/tests/Bridges/fixtures/tags.custom-mode.phtml
@@ -1,6 +1,8 @@
 <?php
 %A%source: %a%Bridges/fixtures/tags.custom-mode.latte%a%
 %A%
+<p>Simple block…</p>
+%A%
 %a%ob_start%a%
 %A%
 %a%Texy Block%a%

diff --git a/tests/Bridges/fixtures/tags.default-mode.html b/tests/Bridges/fixtures/tags.default-mode.html
@@ -1,4 +1,6 @@
 
+<p>Simple block…</p>
+
 <p>Texy Block<br>
 </p>
 

diff --git a/tests/Bridges/fixtures/tags.default-mode.latte b/tests/Bridges/fixtures/tags.default-mode.latte
@@ -1,5 +1,9 @@
 {var $tag = '<br>'}
 
+{texy}
+    Simple block...
+{/texy}
+
 {texy}
     Texy Block {$tag}
 

diff --git a/tests/Bridges/fixtures/tags.default-mode.phtml b/tests/Bridges/fixtures/tags.default-mode.phtml
@@ -1,6 +1,8 @@
 <?php
 %A%source: %a%Bridges/fixtures/tags.default-mode.latte%a%
 %A%
+<p>Simple block…</p>
+%A%
 %a%ob_start%a%
 %A%
 %a%Texy Block%a%