Correctly parse handlebars after raw block

Fixes zordius/lightncandy#344

Author: theodorejb

src/Validator.php

@@ -37,6 +37,7 @@ public static function verify(Context $context, string $template): void
                 }
                 static::pushToken($context, $V);
             }
+            // set template to remainder after pushed token
             $template = "{$matches[Token::POS_RSPACE]}{$matches[Token::POS_ROTHER]}";
         }
         static::pushToken($context, $template);
@@ -473,8 +474,8 @@ protected static function rawblock(array &$token, Context $context): bool
                 $context->error[] = 'Bad token ' . Token::toString($token) . ' ! Do you mean ' . Token::toString($token, [Token::POS_ENDRAW => '}}']) . ' ?';
             }
             if ($context->rawBlock) {
-                Token::setDelimiter($context);
                 $context->rawBlock = false;
+                Token::setDelimiter($context);
             } else {
                 if ($token[Token::POS_OP]) {
                     $context->error[] = "Wrong raw block begin with " . Token::toString($token) . ' ! Remove "' . $token[Token::POS_OP] . '" to fix this issue.';

tests/RegressionTest.php

@@ -1305,6 +1305,16 @@ public static function issueProvider(): array
                 'expected' => '#a(0)=b-321-123#c(1)=d-321-123#e(2)=f-321-123',
             ],
 
+            [
+                'id' => 344,
+                'template' => '{{{{raw}}}} {{bar}} {{{{/raw}}}} {{bar}}',
+                'data' => [
+                    'raw' => true,
+                    'bar' => 'content',
+                ],
+                'expected' => ' {{bar}}  content',
+            ],
+
             [
                 'id' => 357,
                 'template' => '{{echo (echo "foobar(moo).")}}',