Merge branch 'hotfix/59'

Close #59 Fixes #58
zendframework · Apr 12, 2016 · b460309 · b460309
2 parents 6d965ef + 884dd79
commit b460309
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#59](https://github.com/zendframework/zend-stdlib/pull/59) fixes a notice
+  when defining the `Zend\Json\Json::GLOB_BRACE` constant on systems using
+  non-gcc glob implementations.
 
 ## 3.0.0 - 2016-02-03
 

diff --git a/src/Glob.php b/src/Glob.php
@@ -61,7 +61,7 @@ protected static function systemGlob($pattern, $flags)
                 self::GLOB_NOSORT   => GLOB_NOSORT,
                 self::GLOB_NOCHECK  => GLOB_NOCHECK,
                 self::GLOB_NOESCAPE => GLOB_NOESCAPE,
-                self::GLOB_BRACE    => GLOB_BRACE,
+                self::GLOB_BRACE    => defined('GLOB_BRACE') ? GLOB_BRACE : 0,
                 self::GLOB_ONLYDIR  => GLOB_ONLYDIR,
                 self::GLOB_ERR      => GLOB_ERR,
             ];