Merge branch 'hotfix/57'

Close #57
Fixes #56

CHANGELOG.md

@@ -24,6 +24,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#51](https://github.com/zendframework/zend-diactoros/pull/51) fixes
   `MessageTrait::getHeaderLine()` to return an empty string instead of `null` if
   the header is undefined (which is the behavior specified in PSR-7).
+- [#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the
+  behavior of how the `ServerRequestFactory` marshals upload files when they are
+  represented as a nested associative array.
 
 ## 1.0.3 - 2015-06-04
 

src/ServerRequestFactory.php

@@ -469,6 +469,7 @@ private static function createUploadedFileFromSpec(array $value)
      */
     private static function normalizeNestedFileSpec(array $files = [])
     {
+        $normalizedFiles = [];
         foreach (array_keys($files['tmp_name']) as $key) {
             $spec = [
                 'tmp_name' => $files['tmp_name'][$key],
@@ -477,8 +478,8 @@ private static function normalizeNestedFileSpec(array $files = [])
                 'name'     => $files['name'][$key],
                 'type'     => $files['type'][$key],
             ];
-            $files[$key] = self::createUploadedFileFromSpec($spec);
+            $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec);
         }
-        return $files;
+        return $normalizedFiles;
     }
 }

test/ServerRequestFactoryTest.php

@@ -415,4 +415,23 @@ public function testNormalizeServerReturnsArrayUnalteredIfApacheHeadersDoNotCont
 
         $this->assertEquals($expected, $server);
     }
+
+    /**
+     * @group 57
+     * @group 56
+     */
+    public function testNormalizeFilesReturnsOnlyActualFilesWhenOriginalFilesContainsNestedAssociativeArrays()
+    {
+        $files = [ 'fooFiles' => [
+            'tmp_name' => ['file' => 'php://temp'],
+            'size'     => ['file' => 0],
+            'error'    => ['file' => 0],
+            'name'     => ['file' => 'foo.bar'],
+            'type'     => ['file' => 'text/plain'],
+        ]];
+
+        $normalizedFiles = ServerRequestFactory::normalizeFiles($files);
+
+        $this->assertCount(1, $normalizedFiles['fooFiles']);
+    }
 }