Merge remote-tracking branch 'origin/2.2-develop' into MC-18834

Author: BaDos

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/HtmlWrapper.php

@@ -13,7 +13,7 @@ class HtmlWrapper extends Wrapper
 {
     const FILE_EXTENSION = 'html';
 
-    private const TOKENIZER = 'PHP';
+    const TOKENIZER = 'PHP';
 
     /**
      * @inheritDoc

dev/tests/static/testsuite/Magento/Test/Html/LiveCodeTest.php

@@ -27,7 +27,7 @@ class LiveCodeTest extends TestCase
      *
      * @return void
      */
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         self::$reportDir = BP . '/dev/tests/static/report';
         if (!is_dir(self::$reportDir)) {
@@ -40,7 +40,7 @@ public static function setUpBeforeClass(): void
      *
      * @return void
      */
-    public function testCodeStyle(): void
+    public function testCodeStyle()
     {
         $reportFile = self::$reportDir . '/html_report.txt';
         $wrapper = new CodeSniffer\HtmlWrapper();