Fix parsing block parameters with extra whitespace

zordius/lightncandy#371

Author: theodorejb

src/Parser.php

@@ -235,7 +235,7 @@ protected static function advancedVariable(array $vars, Context $context, string
 
             // handle |...|
             if (preg_match(SafeString::IS_BLOCKPARAM_SEARCH, $var, $matched)) {
-                $ret[static::BLOCKPARAM] = explode(' ', $matched[1]);
+                $ret[static::BLOCKPARAM] = preg_split('/\s+/', trim($matched[1]));
                 continue;
             }
 
@@ -366,8 +366,8 @@ protected static function analyze(string $token, Context $context): array
                     if ($quote === 0 && $stack > 0 && preg_match('/(.+=)*(\\(+)/', $t, $m) && !$quotes) {
                         $stack += strlen($m[2]);
                     }
-                    // end an argument when end with expected character
-                    if (substr($t, -1, 1) === $expect) {
+                    // end an argument when token ends with expected character (ignoring whitespace + first instance)
+                    if (substr($t, -1, 1) === $expect && !preg_match('/^\s+' . preg_quote($expect) . '$/', $prev)) {
                         if ($stack > 0 && !$quotes) {
                             preg_match('/(\\)+)$/', $t, $matchedq);
                             $stack -= isset($matchedq[0]) ? strlen($matchedq[0]) : 1;

tests/RegressionTest.php

@@ -1398,6 +1398,32 @@ public static function issueProvider(): array
                 'expected' => '3',
             ],
 
+            [
+                'id' => 371,
+                'template' => <<<_tpl
+                    {{#myeach '[{"a":"ayy", "b":"bee"},{"a":"zzz", "b":"ccc"}]' as | newContext index | }}
+                    Foo {{newContext.a}} {{index}}
+                    {{/myeach}}
+                    _tpl,
+                'options' => new Options(
+                    helpers: [
+                        'myeach' => function ($context, HelperOptions $options) {
+                            $theArray = json_decode($context, true);
+                            if (!is_array($theArray)) {
+                                return '';
+                            }
+
+                            $ret = '';
+                            foreach ($theArray as $i => $value) {
+                                $ret .= $options->fn([], ['blockParams' => [$value, $i]]);
+                            }
+                            return $ret;
+                        },
+                    ],
+                ),
+                'expected' => "Foo ayy 0\nFoo zzz 1\n",
+            ],
+
             [
                 'template' => '{{#each . as |v k|}}#{{k}}{{/each}}',
                 'data' => ['a' => [], 'c' => []],