Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit b460309

Browse files
committed
Merge branch 'hotfix/59'
Close #59 Fixes #58
2 parents 6d965ef + 884dd79 commit b460309

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
1818

1919
### Fixed
2020

21-
- Nothing.
21+
- [#59](https://github.com/zendframework/zend-stdlib/pull/59) fixes a notice
22+
when defining the `Zend\Json\Json::GLOB_BRACE` constant on systems using
23+
non-gcc glob implementations.
2224

2325
## 3.0.0 - 2016-02-03
2426

src/Glob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected static function systemGlob($pattern, $flags)
6161
self::GLOB_NOSORT => GLOB_NOSORT,
6262
self::GLOB_NOCHECK => GLOB_NOCHECK,
6363
self::GLOB_NOESCAPE => GLOB_NOESCAPE,
64-
self::GLOB_BRACE => GLOB_BRACE,
64+
self::GLOB_BRACE => defined('GLOB_BRACE') ? GLOB_BRACE : 0,
6565
self::GLOB_ONLYDIR => GLOB_ONLYDIR,
6666
self::GLOB_ERR => GLOB_ERR,
6767
];

0 commit comments

Comments
 (0)