Merge pull request #1098 from spiral/hotfix/stempler-dircetive-zeros

Fixed bug in directive parser

src/Stempler/src/Parser/Syntax/DynamicSyntax.php

@@ -80,9 +80,9 @@ private function fetchValues(string $body): array
         $src = new StringStream($body);
 
         while ($n = $src->peak()) {
-            if (\in_array($n, ['"', '"'])) {
+            if (\in_array($n, ['"', "'"], true)) {
                 $values[\count($values) - 1] .= $n;
-                while ($nn = $src->peak()) {
+                while (($nn = $src->peak()) !== null) {
                     $values[\count($values) - 1] .= $nn;
                     if ($nn === $n) {
                         break;

src/Stempler/tests/Directive/DirectiveTest.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Directive;
+
+use Spiral\Tests\Stempler\fixtures\ImageDirective;
+use Spiral\Tests\Stempler\Directive\BaseTestCase;
+
+final class DirectiveTest extends BaseTestCase
+{
+    protected const DIRECTIVES = [
+        ImageDirective::class,
+    ];
+
+    public function testStringWithZeroChars(): void
+    {
+        $doc = $this->parse('@image("blog", "test.png", "150|250", "webp")');
+
+        $this->assertSame(
+            '<img title="blog" src="test.png" size="150|250" type="webp">',
+            $this->compile($doc),
+        );
+    }
+
+    public function testStringWithSingleQuotes(): void
+    {
+        $doc = $this->parse("@image('blog', 'test.png', '150|250', 'webp')");
+
+        $this->assertSame(
+            "<img title='blog' src='test.png' size='150|250' type='webp'>",
+            $this->compile($doc),
+        );
+    }
+
+    public function testVariableInjection(): void
+    {
+        $doc = $this->parse('@image("blog", $src, "150|250", "webp")');
+
+        $this->assertSame(
+            '<img title="blog" src="<?php echo $src; ?>" size="150|250" type="webp">',
+            $this->compile($doc),
+        );
+    }
+}

src/Stempler/tests/fixtures/ImageDirective.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\Tests\Stempler\fixtures;
+
+use Spiral\Stempler\Directive\AbstractDirective;
+use Spiral\Stempler\Node\Dynamic\Directive;
+
+final class ImageDirective extends AbstractDirective
+{
+    public function renderImage(Directive $directive): string
+    {
+        return \sprintf(
+            '<img title=%s src=%s size=%s type=%s>',
+            $directive->values[0],
+            \str_starts_with($directive->values[1], '$') ? \sprintf('"<?php echo %s; ?>"', $directive->values[1]) :  $directive->values[1],
+            $directive->values[2],
+            $directive->values[3],
+        );
+    }
+}