Merge branch 'weierophinney-hotfix/4767' into develop

zendframework · Jul 22, 2013 · c7f821e · c7f821e
commit c7f821e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/Factory.php b/src/Factory.php
@@ -59,14 +59,22 @@ class Factory
      *
      * @param  string  $filename
      * @param  bool $returnConfigObject
+     * @param  bool $useIncludePath
      * @return array|Config
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException
      */
-    public static function fromFile($filename, $returnConfigObject = false)
+    public static function fromFile($filename, $returnConfigObject = false, $useIncludePath = false)
     {
         $filepath = $filename;
         if (!file_exists($filename)) {
+            if (!$useIncludePath) {
+                throw new Exception\RuntimeException(sprintf(
+                    'Filename "%s" cannot be found relative to the working directory',
+                    $filename
+                ));
+            }
+
             $fromIncludePath = stream_resolve_include_path($filename);
             if (!$fromIncludePath) {
                 throw new Exception\RuntimeException(sprintf(
@@ -122,14 +130,15 @@ public static function fromFile($filename, $returnConfigObject = false)
      *
      * @param  array   $files
      * @param  bool $returnConfigObject
+     * @param  bool $useIncludePath
      * @return array|Config
      */
-    public static function fromFiles(array $files, $returnConfigObject = false)
+    public static function fromFiles(array $files, $returnConfigObject = false, $useIncludePath = false)
     {
         $config = array();
 
         foreach ($files as $file) {
-            $config = ArrayUtils::merge($config, static::fromFile($file));
+            $config = ArrayUtils::merge($config, static::fromFile($file, false, $useIncludePath));
         }
 
         return ($returnConfigObject) ? new Config($config) : $config;

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -118,7 +118,7 @@ public function testFromIniAndXmlAndPhpFilesFromIncludePath()
             'Xml/include-base2.xml',
             'Php/include-base3.php',
         );
-        $config = Factory::fromFiles($files);
+        $config = Factory::fromFiles($files, false, true);
 
         $this->assertEquals('bar', $config['base']['foo']);
         $this->assertEquals('baz', $config['test']['bar']);