Skip to content

Commit 976e570

Browse files
Change whitelist files to process selection approach
1 parent e730d68 commit 976e570

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

dev/tests/static/phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
</testsuites>
3131
<php>
3232
<ini name="date.timezone" value="America/Los_Angeles"/>
33+
<env name="phpunit.static.testcodestyle.use_whitelist" value="0"/>
3334
<!-- TESTS_COMPOSER_PATH - specify the path to composer binary, if a relative reference cannot be resolved -->
3435
<!--<const name="TESTS_COMPOSER_PATH" value="/usr/local/bin/composer"/>-->
3536
</php>

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static function getWhitelist($fileTypes = ['php'], $changedFilesBaseDir =
7676
{
7777
$changedFiles = self::getChangedFilesList($changedFilesBaseDir);
7878
if (empty($changedFiles)) {
79-
return self::getFullWhitelist();
79+
return [];
8080
}
8181

8282
$globPatternsFolder = ('' !== $baseFilesFolder) ? $baseFilesFolder : self::getBaseFilesFolder();
@@ -194,18 +194,23 @@ function ($file) use ($fileHasAllowedType, $fileIsInAllowedDirectory) {
194194
*
195195
* @return array
196196
*/
197-
private static function getFullWhitelist()
197+
private function getFullWhitelist()
198198
{
199199
return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt');
200200
}
201201

202202
public function testCodeStyle()
203203
{
204+
$useWhiteList = isset($_ENV['phpunit.static.testcodestyle.use_whitelist'])
205+
&& $_ENV['phpunit.static.testcodestyle.use_whitelist'] === '1';
206+
207+
$whiteList = $useWhiteList ? self::getWhitelist(['php']) : $this->getFullWhitelist();
208+
204209
$reportFile = self::$reportDir . '/phpcs_report.txt';
205210
$codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
206211
$this->assertEquals(
207212
0,
208-
$result = $codeSniffer->run(self::getWhitelist(['php'])),
213+
$result = $codeSniffer->run($whiteList),
209214
"PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . file_get_contents($reportFile)
210215
);
211216
}

0 commit comments

Comments
 (0)