Updated PhpReader to pass an empty array to ArrayIterator if no valid…

… value was given

Fixes #3

src/Reader/PhpReader.php

@@ -34,8 +34,11 @@ public function __construct(SplFileObject $file)
     public function getIterator()
     {
         if (!$this->file->isFile()) {
-            throw new ReaderParseException("Invalid file.");
+            throw new ReaderParseException('Invalid file.');
         }
-        return new ArrayIterator(include $this->file->getPathname());
+
+        // The file must return an array or object
+        $result = include $this->file->getPathname();
+        return new ArrayIterator((is_array($result) || is_object($result) ? $result : array()));
     }
 }

tests/Reader/Fixtures/ConfigObject.php

@@ -0,0 +1,4 @@
+<?php
+return (object)array(
+    'key' => 'value'
+);

tests/Reader/Fixtures/Empty.php

@@ -0,0 +1 @@
+<?php

tests/Reader/Fixtures/EmptyArray.php

@@ -0,0 +1,2 @@
+<?php
+return array();

tests/Reader/Fixtures/EmptyNull.php

@@ -0,0 +1,2 @@
+<?php
+return null;

tests/Reader/Fixtures/EmptyObject.php

@@ -0,0 +1,2 @@
+<?php
+return new stdClass();

tests/Reader/PhpReaderTest.php

@@ -27,20 +27,46 @@ protected function getFixturePath()
     /**
      * @covers ::getIterator
      * @uses \Minphp\Configure\Reader\PhpReader
+     * @dataProvider getIteratorDataProvider
+     *
+     * @param string $path The path to the file to mock
+     * @param bool $empty True to verify the result is an empty array, or false that it contains a 'key' => 'value' pair
      */
-    public function testGetIterator()
+    public function testGetIterator($path, $empty)
     {
-        $file = $this->getFileMock($this->getFixturePath() . "Config.php");
+        $file = $this->getFileMock($path);
         $reader = new PhpReader($file);
 
         // Ensure we can load the same file multiple times and get the same result
         for ($i = 0; $i < 2; $i++) {
             $result = $reader->getIterator($file);
             $this->assertInstanceOf('\ArrayIterator', $result);
-            $this->assertEquals("value", $result['key']);
+
+            if ($empty === true) {
+                $this->assertEmpty($result);
+            } else {
+                $this->assertEquals("value", $result['key']);
+            }
         }
     }
 
+    /**
+     * Data Provider for ::testGetIterator
+     */
+    public function getIteratorDataProvider()
+    {
+        $path = $this->getFixturePath();
+
+        return array(
+            array($path . 'Config.php', false),
+            array($path . 'ConfigObject.php', false),
+            array($path . 'Empty.php', true),
+            array($path . 'EmptyArray.php', true),
+            array($path . 'EmptyNull.php', true),
+            array($path . 'EmptyObject.php', true),
+        );
+    }
+
     /**
      * @covers ::getIterator
      * @uses \Minphp\Configure\Reader\PhpReader