danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Make directory recursion robust and windows-safe

Browse Source
This commit is contained in:
Matt Brown 2017-01-18 09:36:16 -05:00
parent d7096df7a6
commit 686891f30f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Psalm/Checker/ProjectChecker.php
View File

@ -735,16 +735,16 @@ class ProjectChecker
*/ */
protected function getConfigForPath($path) protected function getConfigForPath($path)
{ {
$dir_path = realpath($path) . DIRECTORY_SEPARATOR; $dir_path = realpath($path);
if (!is_dir($dir_path)) { if (!is_dir($dir_path)) {
$dir_path = dirname($dir_path) . DIRECTORY_SEPARATOR; $dir_path = dirname($dir_path);
} }
$config = null; $config = null;
do { do {
$maybe_path = $dir_path . Config::DEFAULT_FILE_NAME; $maybe_path = $dir_path . DIRECTORY_SEPARATOR . Config::DEFAULT_FILE_NAME;
if (file_exists($maybe_path)) { if (file_exists($maybe_path)) {
$config = Config::loadFromXMLFile($maybe_path); $config = Config::loadFromXMLFile($maybe_path);
@ -759,8 +759,8 @@ class ProjectChecker
break; break;
} }
$dir_path = preg_replace('/[^\/]+\/$/', '', $dir_path); $dir_path = dirname($dir_path);
} while ($dir_path !== DIRECTORY_SEPARATOR); } while (dirname($dir_path) !== $dir_path);
if (!$config) { if (!$config) {
throw new Exception\ConfigException('Config not found for path ' . $path); throw new Exception\ConfigException('Config not found for path ' . $path);