diff --git a/app/bootstrap.php b/app/bootstrap.php index 4974acdf0fc80..4c96d084f4bb6 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -14,15 +14,15 @@ #ini_set('display_errors', 1); /* PHP version validation */ -if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70103) { +if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70300) { if (PHP_SAPI == 'cli') { - echo 'Magento supports PHP 7.1.3 or later. ' . - 'Please read https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html'; + echo 'Magento supports PHP 7.3.0 or later. ' . + 'Please read https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html'; } else { echo << -

Magento supports PHP 7.1.3 or later. Please read - +

Magento supports PHP 7.3.0 or later. Please read + Magento System Requirements. HTML; diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml index 439b6ac063618..44577771fe4f8 100644 --- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml +++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml @@ -34,7 +34,6 @@ - @@ -84,8 +83,7 @@ - - + diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml index fb58b59b0ccaa..af0a5751a7488 100644 --- a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml +++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml @@ -24,14 +24,15 @@ + - + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml index c51b357091bda..9a3c941fdc9ed 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml @@ -4,45 +4,52 @@ * See COPYING.txt for license details. */ -/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ +use Magento\Framework\Escaper; +use Magento\Framework\View\Helper\SecureHtmlRenderer; + +/** + * @var SecureHtmlRenderer $secureRenderer + * @var Escaper $escaper + */ ?> - -

+ getId() ?> +