public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Use error_get_last to verify why php_strip_whitespace would return an empty string.

pull/4886/head
Niels Keurentjes 2016-02-06 02:32:08 +01:00
parent 86fc85fe56
commit bb08f76ad9
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Autoload/ClassMapGenerator.php
View File

@ -122,21 +122,21 @@ class ClassMapGenerator
$extraTypes .= '|enum'; $extraTypes .= '|enum';
} }
try {
// Use @ here instead of Silencer to actively suppress 'unhelpful' output // Use @ here instead of Silencer to actively suppress 'unhelpful' output
// @link https://github.com/composer/composer/pull/4886 // @link https://github.com/composer/composer/pull/4886
error_clear_last();
$contents = @php_strip_whitespace($path); $contents = @php_strip_whitespace($path);
if (!$contents) { if (!$contents) {
if (!file_exists($path)) { if (is_null(error_get_last())) {
// No error, so the input file was really empty or contained only comments
return array();
} elseif (!file_exists($path)) {
throw new \RuntimeException(sprintf('File at "%s" does not exist, check your classmap definitions', $path)); throw new \RuntimeException(sprintf('File at "%s" does not exist, check your classmap definitions', $path));
} elseif (!is_readable($path)) { } elseif (!is_readable($path)) {
throw new \RuntimeException(sprintf('File at "%s" is not readable, check its permissions', $path)); throw new \RuntimeException(sprintf('File at "%s" is not readable, check its permissions', $path));
} }
throw new \RuntimeException(sprintf('File at "%s" could not be parsed as PHP - it may be binary or corrupted', $path)); throw new \RuntimeException(sprintf('File at "%s" could not be parsed as PHP - it may be binary or corrupted', $path));
} }
} catch (\Exception $e) {
throw new \RuntimeException('Could not scan for classes inside '.$path.": \n".$e->getMessage(), 0, $e);
}
// return early if there is no chance of matching anything in this file // return early if there is no chance of matching anything in this file
if (!preg_match('{\b(?:class|interface'.$extraTypes.')\s}i', $contents)) { if (!preg_match('{\b(?:class|interface'.$extraTypes.')\s}i', $contents)) {