Skip to content

Commit b1a682d

Browse files
committed
MAGETWO-31575: Remove black/white lists from file system and builds configuration
- ObsoleteCodeTest and LiveCodeTest optimized
1 parent 5434f45 commit b1a682d

File tree

4 files changed

+16
-27
lines changed

4 files changed

+16
-27
lines changed

dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,14 @@ class ChangedFiles
2323
public static function getPhpFiles($changedFilesList)
2424
{
2525
$fileHelper = \Magento\Framework\Test\Utility\Files::init();
26-
$allPhpFiles = $fileHelper->getPhpFiles();
2726
if (isset($_ENV['INCREMENTAL_BUILD'])) {
28-
try {
29-
$phpFiles = Files::readLists($changedFilesList);
30-
} catch (\Exception $e){
31-
$phpFiles = [];
27+
$phpFiles = Files::readLists($changedFilesList);
28+
if (!empty($phpFiles)) {
29+
$phpFiles = \Magento\Framework\Test\Utility\Files::composeDataSets($phpFiles);
30+
$phpFiles = array_intersect_key($phpFiles, $fileHelper->getPhpFiles());
3231
}
33-
34-
foreach ($phpFiles as $key => $phpFile) {
35-
$phpFiles[$key] = $fileHelper->getPathToSource() . '/' . $phpFile;
36-
}
37-
$phpFiles = \Magento\Framework\Test\Utility\Files::composeDataSets($phpFiles);
38-
$phpFiles = array_intersect_key($phpFiles, $allPhpFiles);
3932
} else {
40-
$phpFiles = $allPhpFiles;
33+
$phpFiles = $fileHelper->getPhpFiles();
4134
}
4235

4336
return $phpFiles;

dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ function ($file) {
129129
$this->_testObsoleteConstants($content);
130130
$this->_testObsoletePropertySkipCalculate($content);
131131
},
132-
\Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files')
132+
\Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files*')
133133
);
134134
}
135135

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,17 @@ public static function getWhitelist($fileTypes = ['php'])
5252
{
5353
$directoriesToCheck = file(__DIR__ . '/_files/whitelist/common.txt', FILE_IGNORE_NEW_LINES);
5454

55-
try {
56-
$changedFiles = array_filter(
57-
Utility\Files::readLists(__DIR__ . '/_files/changed_files'),
58-
function ($path) use ($directoriesToCheck) {
59-
foreach ($directoriesToCheck as $directory) {
60-
if (strpos($path, BP . '/' . $directory) === 0) {
61-
return true;
62-
}
55+
$changedFiles = array_filter(
56+
Utility\Files::readLists(__DIR__ . '/_files/changed_files*'),
57+
function ($path) use ($directoriesToCheck) {
58+
foreach ($directoriesToCheck as $directory) {
59+
if (strpos($path, BP . '/' . $directory) === 0) {
60+
return true;
6361
}
64-
return false;
6562
}
66-
);
67-
} catch (\Exception $e) {
68-
$changedFiles = [];
69-
}
63+
return false;
64+
}
65+
);
7066

7167
if (!empty($fileTypes)) {
7268
$changedFiles = array_filter(

lib/internal/Magento/Framework/Test/Utility/Files.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ public static function readLists($globPattern)
10681068
*/
10691069
$files = glob(self::init()->getPathToSource() . '/' . $pattern, GLOB_BRACE);
10701070
if (empty($files)) {
1071-
throw new \Exception("The glob() pattern '{$pattern}' didn't return any result.");
1071+
continue;
10721072
}
10731073
$result = array_merge($result, $files);
10741074
}

0 commit comments

Comments
 (0)