MAGETWO-81646: PHP Livecodetest testCodeStyle() method does not use w…

…hitelist files #11362 - revert workaround
magento · Jan 31, 2018 · 18028c0 · 18028c0
1 parent 8c325eb
commit 18028c0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -199,13 +199,11 @@ private function getFullWhitelist()
 
     public function testCodeStyle()
     {
-        $whiteList = defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1'
-            ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']);
-
+        $isFullScan = defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1';
         $reportFile = self::$reportDir . '/phpcs_report.txt';
         $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
-        $result = $codeSniffer->run($whiteList);
-        $report = file_exists($reportFile) ? file_get_contents($reportFile) : '';
+        $result = $codeSniffer->run($isFullScan ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']));
+        $report = file_get_contents($reportFile);
         $this->assertEquals(
             0,
             $result,