Merge branch 'feature/glob-fallback' of https://github.com/EvanDotPro…

…/zf2
zendframework · May 31, 2012 · 9ae8ef7 · 9ae8ef7
commit 9ae8ef7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Listener/ConfigListener.php b/src/Listener/ConfigListener.php
@@ -16,6 +16,7 @@
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
 use Zend\ModuleManager\ModuleEvent;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\Glob;
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\ListenerAggregateInterface;
 
@@ -303,7 +304,7 @@ protected function mergePath($path)
                 break;
 
             case self::GLOB_PATH:
-                $config = ConfigFactory::fromFiles(glob($path['path'], GLOB_BRACE));
+                $config = ConfigFactory::fromFiles(Glob::glob($path['path'], Glob::GLOB_BRACE));
                 break;
         }
         $this->mergeTraversableConfig($config);