[Zend\Config\Factory] Throw exception for unrecognized config extension

Also added unit tests for expected exceptions.
deshymers · Feb 29, 2012 · 7f019a6 · 7f019a6
1 parent ea8bc44
commit 7f019a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/library/Zend/Config/Factory.php b/library/Zend/Config/Factory.php
@@ -71,7 +71,7 @@ public static function fromFile($filename)
                 break;
         }
 
-        return null;
+        throw new Exception\RuntimeException(sprintf('Unsupported config file extension: .%s', $pathinfo['extension']));
     }
 
     /**

diff --git a/tests/Zend/Config/FactoryTest.php b/tests/Zend/Config/FactoryTest.php
@@ -85,5 +85,17 @@ public function testFromIniAndXmlFiles()
         $this->assertEquals('bar', $config['base']['foo']);
         $this->assertEquals('baz', $config['test']['bar']);
     }
+
+    public function testNonExistentFileThrowsRuntimeException()
+    {
+        $this->setExpectedException('RuntimeException');
+        $config = Factory::fromFile('foo.bar');
+    }
+
+    public function testInvalidFileExtensionThrowsInvalidArgumentException()
+    {
+        $this->setExpectedException('RuntimeException');
+        $config = Factory::fromFile(__DIR__ . '/TestAssets/bad.ext');
+    }
 }
 
diff --git a/tests/Zend/Config/TestAssets/bad.ext b/tests/Zend/Config/TestAssets/bad.ext
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ public static function fromFile($filename) @@
                     break;
             }
-            return null;
+            throw new Exception\RuntimeException(sprintf('Unsupported config file extension: .%s', $pathinfo['extension']));
         }
         /**
@@ Expand Down @@