Merge pull request #10 from magento-commerce/imported-magento-magento-coding-standard-202

[Imported] Avoid infinite loop when Parse Error occurs

Author: sivaschenko

Magento2/Sniffs/Security/XssTemplateSniff.php

@@ -249,8 +249,10 @@ private function parseLineStatement($start, $end)
         $posOfLastInlineThen = $this->findLastInScope(T_INLINE_THEN, $start, $end);
         if ($posOfLastInlineThen !== false) {
             $posOfInlineElse = $this->file->findNext(T_INLINE_ELSE, $posOfLastInlineThen, $end);
-            $this->addStatement($posOfLastInlineThen + 1, $posOfInlineElse);
-            $this->addStatement($posOfInlineElse + 1, $end);
+            if ($posOfInlineElse !== false) {
+                $this->addStatement($posOfLastInlineThen + 1, $posOfInlineElse);
+                $this->addStatement($posOfInlineElse + 1, $end);
+            }
             $parsed = true;
         } else {
             do {

Magento2/Tests/Security/XssTemplateUnitTest.inc

@@ -57,3 +57,6 @@ echo $var;
 <?php echo $block->escapeCss($css); ?>
 <?php echo $block->getJsLayout($jsLayout); ?>
 <?= /* @noEscape */ json_encode($config) ?>
+
+<!-- intentional parse error -->
+<?= $block->escapeUrl($block->getUrl('no-route')) <?= $block->getBaseUrl() ?>