From 3ca7dd7750008e2e8b9cd7b5eb05b60a68ad4ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torben=20K=C3=B6hn?= <torben.koehn@mercoline.de>
Date: Fri, 20 May 2016 12:54:00 +0200
Subject: [PATCH] Added tag interpolation (#97)

---
 Compiler.php               | 11 +++++------
 Lexer.php                  |  2 +-
 Test/InterpolationTest.php |  8 ++++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Compiler.php b/Compiler.php
index 42886e9..c5a0c50 100644
--- a/Compiler.php
+++ b/Compiler.php
@@ -1889,10 +1889,9 @@ protected function compileElement(Node $node)
 
         $phtml = '';
 
-        if (!$node->tag)
-            $node->tag = $this->options['default_tag'];
+        $tag = $this->interpolate($node->tag ?: $this->options['default_tag']);
 
-        $phtml .= "<{$node->tag}";
+        $phtml .= "<{$tag}";
 
         $htmlMode = $this->isHtml();
         $xhtmlMode = $this->isXhtml();
@@ -2070,14 +2069,14 @@ protected function compileElement(Node $node)
         }
 
         $hasChildren = count($node->children) > 0;
-        $isSelfClosing = in_array($node->tag, $this->options['self_closing_tags']);
+        $isSelfClosing = in_array($tag, $this->options['self_closing_tags']);
 
         if (!$hasChildren && (!$htmlMode || !$isSelfClosing)) {
 
             if ($anyHtmlMode && !$isSelfClosing) {
 
                 //Force closed tag in HTML
-                $phtml .= "></{$node->tag}>";
+                $phtml .= "></{$tag}>";
 
                 return $phtml;
             }
@@ -2093,7 +2092,7 @@ protected function compileElement(Node $node)
             return $phtml;
 
         $phtml .= $this->compileChildren($node->children);
-        $phtml .= $this->newLine().$this->indent()."</{$node->tag}>";
+        $phtml .= $this->newLine().$this->indent()."</{$tag}>";
 
         return $phtml;
     }
diff --git a/Lexer.php b/Lexer.php
index 6ba2610..749339c 100644
--- a/Lexer.php
+++ b/Lexer.php
@@ -1511,7 +1511,7 @@ protected function scanDoctype()
     protected function scanTag()
     {
 
-        foreach ($this->scanToken('tag', '(?<name>[a-zA-Z_][a-zA-Z0-9\-_]*)', 'i') as $token) {
+        foreach ($this->scanToken('tag', '(?<name>(([a-zA-Z_][a-zA-Z0-9\-_]*)?[\?!#]\{[^\}]+\}([a-zA-Z_][a-zA-Z0-9\-_]*)?|[a-zA-Z_][a-zA-Z0-9\-_]*))', 'i') as $token) {
 
             yield $token;
 
diff --git a/Test/InterpolationTest.php b/Test/InterpolationTest.php
index 4fce415..c8a6b65 100644
--- a/Test/InterpolationTest.php
+++ b/Test/InterpolationTest.php
@@ -102,4 +102,12 @@ public function testIeConditionals()
 
         $this->assertEquals('<!--[if IE8]><script src="ie8.js"></script><![endif]-->', $this->renderer->compile("<!--[if IE8]>\nscript(src='ie8.js')\n<![endif]-->"));
     }
+
+    public function testTagInterpolation()
+    {
+
+        $this->assertEquals('<?php $tagName = \'abcdefghi\'?><<?=htmlentities(isset($tagName) ? $tagName : \'\', \ENT_QUOTES, \'UTF-8\')?> class="some-class">Some Content</<?=htmlentities(isset($tagName) ? $tagName : \'\', \ENT_QUOTES, \'UTF-8\')?>>', $this->renderer->compile("\$tagName='abcdefghi'\n#{\$tagName}.some-class Some Content"));
+        $this->assertEquals('<?php $tagName = \'def\'?><abc<?=htmlentities(isset($tagName) ? $tagName : \'\', \ENT_QUOTES, \'UTF-8\')?>ghi class="some-class">Some Content</abc<?=htmlentities(isset($tagName) ? $tagName : \'\', \ENT_QUOTES, \'UTF-8\')?>ghi>', $this->renderer->compile("\$tagName='def'\nabc#{\$tagName}ghi.some-class Some Content"));
+
+    }
 }
\ No newline at end of file