Merge pull request zendframework/zendframework#1936 from EvanDotPro/h…

…otfix/glob-constant-value Fix GLOB_ERR constant value
zendframework · Jul 20, 2012 · 7ab35a6 · 7ab35a6
8 parents cb39e7e + 54a28dc + c9c769e + dda791d + 70d382a + 8bbad0e + 9321185 + 370cf4d
commit 7ab35a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Glob.php b/src/Glob.php
@@ -27,7 +27,7 @@ abstract class Glob
     const GLOB_NOESCAPE = 0x08;
     const GLOB_BRACE    = 0x10;
     const GLOB_ONLYDIR  = 0x20;
-    const GLOB_ERR      = 0x30;
+    const GLOB_ERR      = 0x40;
     /**#@-*/
 
     /**

diff --git a/test/GlobTest.php b/test/GlobTest.php
@@ -26,4 +26,10 @@ public function testFallback()
             Glob::glob(__DIR__ . '/_files/{alph,bet}a', Glob::GLOB_BRACE, true)
         );
     }
+
+    public function testNonMatchingGlobReturnsArray()
+    {
+        $result = Glob::glob('/some/path/{,*.}{this,orthis}.php', Glob::GLOB_BRACE);
+        $this->assertInternalType('array', $result);
+    }
 }