Merge remote-tracking branch 'upstream/develop' into vsprintf

Author: fredden

.github/workflows/php.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4']
     name: Tests with PHP ${{ matrix.php-versions }}
 
     steps:

.travis.yml

@@ -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/Sniffs/Security/XssTemplateSniff.php

@@ -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() ?>

Magento2/Tests/Security/XssTemplateUnitTest.inc

@@ -8,12 +8,12 @@
     "type": "phpcodesniffer-standard",
     "version": "6",
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.2",
         "squizlabs/php_codesniffer": "^3.5",
-        "webonyx/graphql-php": ">=0.12.6 <1.0"
+        "webonyx/graphql-php": "^14.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "classmap": [