Fix nested else if validation

zordius/lightncandy#313

Author: theodorejb

src/Validator.php

@@ -579,10 +579,15 @@ protected static function doElse(Context $context, array $vars)
         }
 
         if (isset($vars[1][0])) {
-            $token = $context->currentToken;
+            $if = $vars[1][0];
+            $innerTag = $context->currentToken[Token::POS_INNERTAG];
+            $condition = preg_replace("/^\\s*else\\s+{$if}\\s*/", '', $innerTag);
             $context->currentToken[Token::POS_INNERTAG] = 'else';
-            $context->currentToken[Token::POS_RSPACE] = "{{#{$vars[1][0]} " . preg_replace('/^\\s*else\\s+' . $vars[1][0] . '\\s*/', '', $token[Token::POS_INNERTAG]) . '}}' . $context->currentToken[Token::POS_RSPACE];
-            array_unshift($context->elseLvl[0], $vars[1][0]);
+            $context->currentToken[Token::POS_RSPACE] = "{{#$if $condition}}" . $context->currentToken[Token::POS_RSPACE];
+            if (!$context->elseLvl) {
+                array_unshift($context->elseLvl, []);
+            }
+            array_unshift($context->elseLvl[0], $if);
             $context->elseChain = true;
         }
 

tests/RegressionTest.php

@@ -1366,6 +1366,27 @@ public static function issueProvider(): array
                 'expected' => 'SOME-TEXT-foobar...',
             ],
 
+            [
+                'id' => 313,
+                'template' => <<<_tpl
+                    {{#if conditionA}}
+                      {{#if conditionA1}}
+                        Do something then do more stuff conditionally
+                        {{#if conditionA1.x}}
+                          Do something here
+                        {{else if conditionA1.y}}
+                          Do something else here
+                        {{/if}}
+                      {{/if}}
+                    {{else if conditionB}}
+                      Do something else
+                    {{else}}
+                      Finally, do this last thing if all else fails
+                    {{/if}}
+                    _tpl,
+                'expected' => "  Finally, do this last thing if all else fails\n",
+            ],
+
             [
                 'id' => 315,
                 'template' => '{{#each foo}}#{{@key}}({{@index}})={{.}}-{{moo}}-{{@irr}}{{/each}}',