[EngCom] Public Pull Requests - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

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

@@ -42,7 +42,7 @@ public static function setUpBeforeClass()
      */
     public function testCodeStyle()
     {
-        $reportFile = self::$reportDir . '/less_report.txt';
+        $reportFile = self::$reportDir . '/csless_report.txt';
         $wrapper = new LessWrapper();
         $codeSniffer = new CodeSniffer(realpath(__DIR__ . '/_files/lesscs'), $reportFile, $wrapper);
 
@@ -56,10 +56,11 @@ public function testCodeStyle()
 
         $result = $codeSniffer->run($this->filterFiles($fileList));
 
+        $report = file_exists($reportFile) ? file_get_contents($reportFile) : "";
         $this->assertEquals(
             0,
             $result,
-            "PHP Code Sniffer has found {$result} error(s): See detailed report in {$reportFile}"
+            "PHP Code Sniffer has found {$result} error(s): " . PHP_EOL . $report
         );
     }