fix: clear comments fail on has sepcial chars

phppkg · Nov 29, 2021 · a5a0cb4 · a5a0cb4
1 parent 5615bee
commit a5a0cb4
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 5 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0]
+        php: [8.0, 8.1]
         os: [ubuntu-latest, macOS-latest] # windows-latest,
 #        include: # will not testing on php 7.2
 #          - os: 'ubuntu-latest'

diff --git a/src/Compiler/PregCompiler.php b/src/Compiler/PregCompiler.php
@@ -8,9 +8,9 @@
 use function implode;
 use function is_numeric;
 use function preg_match;
+use function preg_replace;
 use function preg_replace_callback;
 use function str_contains;
-use function str_ends_with;
 use function strlen;
 use function substr;
 use function trim;
@@ -65,6 +65,11 @@ public function compile(string $tplCode): string
         $openTagE  = $this->openTagE;
         $closeTagE = $this->closeTagE;
 
+        // comments block. `{{# comments #}}`
+        if (str_contains($tplCode, "$this->openTag#")) {
+            $tplCode = preg_replace("~$openTagE#.+?#$closeTagE~s", '', $tplCode);
+        }
+
         $flags = 0;
         // $flags = PREG_OFFSET_CAPTURE;
         // $flags = PREG_PATTERN_ORDER | PREG_SET_ORDER;
@@ -109,9 +114,9 @@ public function parseCodeBlock(string $block): string
         }
 
         // comments block. `{{# comments #}}`
-        if ($block[0] === '#' && str_ends_with($block, '#')) {
-            return '';
-        }
+        // if ($block[0] === '#' && str_ends_with($block, '#')) {
+        //     return '';
+        // }
 
         $isInline = !str_contains($trimmed, "\n");
         $kwPattern = Token::getBlockNamePattern();

diff --git a/test/Compiler/PregCompilerTest.php b/test/Compiler/PregCompilerTest.php
@@ -199,6 +199,45 @@ public function testCompile_customDirective():void
         }
     }
 
+    public function testCompile_has_comments():void
+    {
+        $p = new PregCompiler();
+
+        $str = <<<'TXT'
+{{# comments #}} hello
+TXT;
+        $out = $p->compile($str);
+        $this->assertStringNotContainsString('{{#', $out);
+        $this->assertStringNotContainsString('comments', $out);
+        $this->assertEquals(' hello', $out);
+
+        $str = <<<'TXT'
+{{# multi
+ line
+  comments
+#}} hello
+TXT;
+        $out = $p->compile($str);
+        $this->assertStringNotContainsString('{{#', $out);
+        $this->assertStringNotContainsString('comments', $out);
+        $this->assertEquals(' hello', $out);
+
+        $str = <<<'TXT'
+{{ foreach ($vars as $var): }}
+{{#
+comments
+ newInfo.incr{{ $var | ucfirst }}({{ $var }});
+#}}
+public void {{ $var | ucfirst }}(Integer value) {
+    {{ $var }} += value;
+}
+{{ endforeach }}
+TXT;
+        $out = $p->compile($str);
+        $this->assertStringNotContainsString('{{#', $out);
+        $this->assertStringNotContainsString('comments', $out);
+    }
+
     public function testCompile_if_block():void
     {
         $p = new PregCompiler();