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

Merge pull request #7477 from staabm/patch-1 

GLOB_BRACE is not defined on all platforms
pull/7478/head
Rob 2018-07-18 17:01:29 +02:00 committed by GitHub
parent b3d6a17518 70a1a6e510
commit b44c9acae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Repository/PathRepository.php
View File

@ -174,9 +174,17 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
*/ */
private function getUrlMatches() 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 // Ensure environment-specific path separators are normalized to URL separators
return array_map(function ($val) { return array_map(function ($val) {
return rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $val), '/'); return rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $val), '/');
}, glob($this->url, GLOB_MARK | GLOB_ONLYDIR | GLOB_BRACE)); }, glob($this->url, $flags));
} }
} }