Jingga/Build
1
0
Fork 0
mirror of https://github.com/Karaka-Management/Build.git synced 2026-02-10 00:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generator array merge fix

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-07-23 21:35:02 +02:00
parent cc1879777c
commit 4a58aaffc0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testGenerator.php
View File

@ -12,7 +12,7 @@ function listFolderFiles($dir, $extension)
foreach ($ffs as $ff) { foreach ($ffs as $ff) {
if ($ff !== '.' && $ff !== '..') { if ($ff !== '.' && $ff !== '..') {
if (is_dir($dir . '/' . $ff)) { if (is_dir($dir . '/' . $ff)) {
$files += listFolderFiles($dir . '/' . $ff, $extension); $files = array_merge($files, listFolderFiles($dir . '/' . $ff, $extension));
} else { } else {
if (endsWith($ff, $extension)) { if (endsWith($ff, $extension)) {
$files[] = $dir . '/' . $ff; $files[] = $dir . '/' . $ff;
@ -49,9 +49,9 @@ foreach ($files as $file) {
} }
} }
// PHP tests // JS tests
$base = __DIR__ . '/../jsOMS'; $base = __DIR__ . '/../jsOMS';
$files = listFolderFiles($base, '.php'); $files = listFolderFiles($base, '.js');
$testBase = __DIR__ . '/../Tests/JS/Framework'; $testBase = __DIR__ . '/../Tests/JS/Framework';
foreach ($files as $file) { foreach ($files as $file) {