Merge pull request #7477 from staabm/patch-1
GLOB_BRACE is not defined on all platformspull/7478/head
commit
b44c9acae6
|
@ -174,9 +174,17 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
|
|||
*/
|
||||
private function getUrlMatches()
|
||||
{
|
||||
$flags = GLOB_MARK | GLOB_ONLYDIR;
|
||||
|
||||
if (defined('GLOB_BRACE')) {
|
||||
$flags |= GLOB_BRACE;
|
||||
} elseif (strpos($this->url, '{') !== false || strpos($this->url, '}') !== false) {
|
||||
throw new \RuntimeException('The operating system does not support GLOB_BRACE which is required for the url '. $this->url);
|
||||
}
|
||||
|
||||
// Ensure environment-specific path separators are normalized to URL separators
|
||||
return array_map(function ($val) {
|
||||
return rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $val), '/');
|
||||
}, glob($this->url, GLOB_MARK | GLOB_ONLYDIR | GLOB_BRACE));
|
||||
}, glob($this->url, $flags));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue