Merge branch '3.x'

* 3.x: Updated latest version to "3.3.1" Updated dev-master alias to latest version Updated CHANGELOG Fixed passing of flags Checked result value of glob() Conflicts: CHANGELOG.md src/Iterator/GlobIterator.php
webmozarts · Dec 23, 2015 · 446d522 · 446d522
2 parents 74131af + b898d06
commit 446d522
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ Changelog
  * added argument `$delimiter` to `Glob::toRegEx()`
  * removed `Symbol` class
 
+* 3.3.1 (2015-12-23)
+
+ * checked return value of `glob()`
+
 * 3.3.0 (2015-12-23)
 
  * improved globbing performance by falling back to PHP's `glob()` function

diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
 Webmozart Glob
 ==============
 
-[![Build Status](https://travis-ci.org/webmozart/glob.svg?branch=master)](https://travis-ci.org/webmozart/glob)
+[![Build Status](https://travis-ci.org/webmozart/glob.svg?branch=3.3.1)](https://travis-ci.org/webmozart/glob)
 [![Build status](https://ci.appveyor.com/api/projects/status/das6j3x0org6219m/branch/master?svg=true)](https://ci.appveyor.com/project/webmozart/glob/branch/master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/webmozart/glob/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/webmozart/glob/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/webmozart/glob/badges/quality-score.png?b=3.3.1)](https://scrutinizer-ci.com/g/webmozart/glob/?branch=3.3.1)
 [![Latest Stable Version](https://poser.pugx.org/webmozart/glob/v/stable.svg)](https://packagist.org/packages/webmozart/glob)
 [![Total Downloads](https://poser.pugx.org/webmozart/glob/downloads.svg)](https://packagist.org/packages/webmozart/glob)
-[![Dependency Status](https://www.versioneye.com/php/webmozart:glob/3.3.0/badge.svg)](https://www.versioneye.com/php/webmozart:glob/3.3.0)
+[![Dependency Status](https://www.versioneye.com/php/webmozart:glob/3.3.1/badge.svg)](https://www.versioneye.com/php/webmozart:glob/3.3.1)
 
-Latest release: [3.3.0](https://packagist.org/packages/webmozart/glob#3.3.0)
+Latest release: [3.3.1](https://packagist.org/packages/webmozart/glob#3.3.1)
 
 A utility implementing Ant-like globbing. 
 

diff --git a/src/Iterator/GlobIterator.php b/src/Iterator/GlobIterator.php
@@ -38,7 +38,7 @@ class GlobIterator extends IteratorIterator
      */
     public function __construct($glob, $flags = 0)
     {
-        $basePath = Glob::getBasePath($glob);
+        $basePath = Glob::getBasePath($glob, $flags);
 
         if (!Glob::isDynamic($glob) && file_exists($glob)) {
             // If the glob is a file path, return that path