Closed #44.

hassankhan · Sep 1, 2015 · bd6775e · bd6775e
1 parent f1f35d3
commit bd6775e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/Config.php b/src/Config.php
@@ -62,7 +62,7 @@ public function __construct($path)
             $parser    = $this->getParser($extension);
 
             // Try and load file
-            $this->data = array_replace_recursive($this->data, $parser->parse($path));
+            $this->data = array_replace_recursive($this->data, (array) $parser->parse($path));
         }
 
         parent::__construct($this->data);

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -175,6 +175,22 @@ public function testConstructWithYml()
 
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * @covers Noodlehaus\Config::__construct()
+     * @covers Noodlehaus\Config::getParser()
+     * @covers Noodlehaus\Config::getPathFromArray()
+     * @covers Noodlehaus\Config::getValidPath()
+     */
+    public function testConstructWithEmptyYml()
+    {
+        $config = new Config(__DIR__ . '/mocks/pass/empty.yaml');
+
+        $expected = array();
+        $actual   = $config->all();
+
+        $this->assertEquals($expected, $actual);
+    }
 
     /**
      * @covers       Noodlehaus\Config::__construct()

diff --git a/tests/mocks/pass/empty.yaml b/tests/mocks/pass/empty.yaml