diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #14503 [Finder] Only use GLOB_BRACE when available (dosten) 

This PR was squashed before being merged into the 2.6 branch (closes #14503).

Discussion
----------

[Finder] Only use GLOB_BRACE when available

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14502
| License       | MIT

Commits
-------

7632d27 [Finder] Only use GLOB_BRACE when available
This commit is contained in:
Fabien Potencier 2015-05-01 15:39:21 +02:00
parent 1439da4c30 7632d2787e
commit 8dcc7e3391
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Finder/Finder.php
View File

@ -671,7 +671,7 @@ class Finder implements \IteratorAggregate, \Countable
foreach ((array) $dirs as $dir) {
if (is_dir($dir)) {
$resolvedDirs[] = $dir;
} elseif ($glob = glob($dir, GLOB_BRACE | GLOB_ONLYDIR)) {
} elseif ($glob = glob($dir, (defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) {
$resolvedDirs = array_merge($resolvedDirs, $glob);
} else {
throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir));