Fix parsing single-quoted string arguments

Fixes zordius/lightncandy#281
Fixes zordius/lightncandy#357
Fixes zordius/lightncandy#367

Author: theodorejb

src/Parser.php

@@ -285,7 +285,7 @@ protected static function advancedVariable(array $vars, Context $context, string
     /**
      * Detect quote characters in a string
      *
-     * @return array<string,int>|null Expected ending string when there is a quote character
+     * @return array{string,int}|null Expected ending string when there is a quote character
      */
     protected static function detectQuote(string $string): ?array
     {
@@ -300,7 +300,7 @@ protected static function detectQuote(string $string): ?array
         }
 
         // begin with \' without ending '
-        if (preg_match('/^\\\\\'[^\']*$/', $string)) {
+        if (preg_match('/^\'[^\']*$/', $string)) {
             return ['\'', 0];
         }
 
@@ -315,7 +315,7 @@ protected static function detectQuote(string $string): ?array
         }
 
         // =\' exists without ending '
-        if (preg_match('/^[^\']*=\\\\\'[^\']*$/', $string)) {
+        if (preg_match('/^[^\']*=\'[^\']*$/', $string)) {
             return ['\'', 0];
         }
 
@@ -337,7 +337,7 @@ protected static function detectQuote(string $string): ?array
     protected static function analyze(string $token, Context $context): array
     {
         // Do not break quoted strings. Also, allow escaped quotes inside them.
-        $count = preg_match_all('/(\s*)([^"\s]*"(\\\\\\\\.|[^"])*"|[^\'\s]*\'(\\\\\\\\.|[^\'])*\'|\S+)/', $token, $matches);
+        $count = preg_match_all('/(\s*)([^"\s]*"(\\\\\\\\.|[^"])*"|[^\'\s]*\'(\\\\\\\\.|[^\'])*\'|\\S+)/', $token, $matches);
         // Parse arguments and deal with "..." or [...] or (...) or \'...\' or |...|
         if ($count > 0) {
             $vars = [];
@@ -350,15 +350,15 @@ protected static function analyze(string $token, Context $context): array
                 $detected = static::detectQuote($t);
 
                 if ($expect === ')') {
-                    if ($detected && ($detected[0] !== ')')) {
+                    if ($detected && $detected[0] !== ')') {
                         $quote = $detected[0];
                     }
                     if (substr($t, -1, 1) === $quote) {
                         $quote = 0;
                     }
                 }
                 // if we are inside quotes, we should later skip stack changes
-                $quotes = preg_match("/^\".*\"$|^'.*'$/", $t);
+                $quotes = preg_match("/^(\".*\")|('.*')$/", $t);
 
                 // continue from previous match when expect something
                 if ($expect) {

tests/RegressionTest.php

@@ -1161,6 +1161,18 @@ public static function issueProvider(): array
                 'expected' => 'ECHO: ECHO: foo bar (moo).',
             ],
 
+            [
+                'id' => 281,
+                'template' => "{{test 'foo bar' (toRegex '^(foo|bar|baz)')}}",
+                'options' => new Options(
+                    helpers: [
+                        'toRegex' => fn($regex) => "/$regex/",
+                        'test' => fn(string $str, string $regex) => (bool) preg_match($regex, $str),
+                    ],
+                ),
+                'expected' => 'true',
+            ],
+
             [
                 'id' => 284,
                 'template' => '{{> foo}}',
@@ -1340,6 +1352,16 @@ public static function issueProvider(): array
                 ),
                 'expected' => 'ECHO: ECHO: foobar(moo).',
             ],
+            [
+                'id' => 357,
+                'template' => "{{{debug (debug 'foobar(moo).')}}}",
+                'options' => new Options(
+                    helpers: [
+                        'debug' => fn($arg1) => "ECHO: $arg1",
+                    ],
+                ),
+                'expected' => 'ECHO: ECHO: foobar(moo).',
+            ],
             [
                 'id' => 357,
                 'template' => '{{echo (echo "foobar(moo)." (echo "moobar(foo)"))}}',
@@ -1351,6 +1373,17 @@ public static function issueProvider(): array
                 'expected' => 'ECHO: ECHO: foobar(moo).',
             ],
 
+            [
+                'id' => 367,
+                'template' => "{{#each (myfunc 'foo(bar)' ) }}{{.}},{{/each}}",
+                'options' => new Options(
+                    helpers: [
+                        'myfunc' => fn($arg) => explode('(', $arg),
+                    ],
+                ),
+                'expected' => 'foo,bar),',
+            ],
+
             [
                 'id' => 369,
                 'template' => '{{#each paragraphs}}<p>{{this}}</p>{{else}}<p class="empty">{{foo}}</p>{{/each}}',