Merge branch 'hotfix/zf2-309'

src/Reader/Ini.php

@@ -130,7 +130,12 @@ protected function process(array $data)
 
         foreach ($data as $section => $value) {
             if (is_array($value)) {
-                $config[$section] = $this->processSection($value);
+                if (strpos($section, $this->nestSeparator) !== false) {
+                    $section = explode($this->nestSeparator, $section, 2);
+                    $config[$section[0]][$section[1]] = $this->processSection($value);
+                } else {
+                    $config[$section] = $this->processSection($value);
+                }
             } else {
                 $this->processKey($section, $value, $config);
             }

test/Reader/IniTest.php

@@ -83,4 +83,21 @@ public function testFromStringWithSection()
         $this->assertEquals($arrayIni['all']['bar'][0], 'baz');
         $this->assertEquals($arrayIni['all']['bar'][1], 'foo');
     }
+
+    public function testFromStringNested()
+    {
+        $ini = <<<ECS
+foo.bar = foobar
+foobar[] = foobarArray
+foo.baz[] = foobaz1
+foo.baz[] = foobaz2
+
+ECS;
+
+        $arrayIni = $this->reader->fromString($ini);
+        $this->assertEquals($arrayIni['foo']['bar'], 'foobar');
+        $this->assertEquals($arrayIni['foobar'][0], 'foobarArray');
+        $this->assertEquals($arrayIni['foo']['baz'][0], 'foobaz1');
+        $this->assertEquals($arrayIni['foo']['baz'][1], 'foobaz2');
+    }
 }