Skip to content

Commit 3baf0af

Browse files
committed
Fix psalm
1 parent 595ec18 commit 3baf0af

File tree

1 file changed

+16
-40
lines changed

1 file changed

+16
-40
lines changed

psalm_autoload.php

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,25 @@
44

55
require __DIR__ . '/system/util_bootstrap.php';
66

7-
$helperDirs = [
7+
$directories = [
88
'system/Helpers',
9-
];
10-
11-
foreach ($helperDirs as $dir) {
12-
$dir = __DIR__ . '/' . $dir;
13-
if (! is_dir($dir)) {
14-
continue;
15-
}
16-
17-
chdir($dir);
18-
19-
foreach (glob('*_helper.php') as $filename) {
20-
$filePath = realpath($dir . '/' . $filename);
21-
22-
require_once $filePath;
23-
}
24-
}
25-
26-
$dirs = [
27-
'tests/_support/_controller',
28-
'tests/_support/Controllers',
29-
'tests/_support/Entity',
30-
'tests/_support/Entity/Cast',
31-
'tests/_support/Models',
32-
'tests/_support/Validation',
33-
'tests/_support/View',
9+
'tests/_support',
3410
'tests/system/Config/fixtures',
3511
];
3612

37-
foreach ($dirs as $dir) {
38-
$dir = __DIR__ . '/' . $dir;
39-
if (! is_dir($dir)) {
40-
continue;
41-
}
42-
43-
chdir($dir);
44-
45-
foreach (glob('*.php') as $filename) {
46-
$filePath = realpath($dir . '/' . $filename);
47-
48-
require_once $filePath;
13+
foreach ($directories as $directory) {
14+
$iterator = new RecursiveIteratorIterator(
15+
new RecursiveDirectoryIterator(
16+
$directory,
17+
RecursiveDirectoryIterator::SKIP_DOTS | RecursiveDirectoryIterator::CURRENT_AS_FILEINFO,
18+
),
19+
RecursiveIteratorIterator::CHILD_FIRST,
20+
);
21+
22+
/** @var SplFileInfo $file */
23+
foreach ($iterator as $file) {
24+
if ($file->isFile() && $file->getExtension() === 'php') {
25+
require_once $file->getPathname();
26+
}
4927
}
5028
}
51-
52-
chdir(__DIR__);

0 commit comments

Comments
 (0)