Merge branch 'hotfix/7'

Close #7 Fixes #6
zendframework · May 10, 2016 · 67dfe50 · 67dfe50
2 parents fc99e57 + ef3f476
commit 67dfe50
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 0.2.2 - 2016-05-10
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#7](https://github.com/zendframework/zend-psr7bridge/pull/7) fixes
+  the logic in `Psr7ServerRequest::convertUploadedFiles()` to ensure that the
+  `tmp_name` is provided to the `$_FILES` structure from the PSR-7 uploaded
+  files.
+- [#7](https://github.com/zendframework/zend-psr7bridge/pull/7) fixes
+  the logic in `Psr7ServerRequest::convertFilesToUploaded()` to iterate the
+  entire value provided it, instead of a fictitious `file` key.
+
 ## 0.2.1 - 2015-12-15
 
 ### Added

diff --git a/src/Psr7ServerRequest.php b/src/Psr7ServerRequest.php
@@ -109,7 +109,7 @@ private static function convertUploadedFiles(array $uploadedFiles)
                 'name'     => $upload->getClientFilename(),
                 'type'     => $upload->getClientMediaType(),
                 'size'     => $upload->getSize(),
-                'tmp_name' => $upload->getStream(),
+                'tmp_name' => $upload->getStream()->getMetadata('uri'),
                 'error'    => $upload->getError(),
             ];
         }
@@ -124,21 +124,18 @@ private static function convertUploadedFiles(array $uploadedFiles)
      */
     private static function convertFilesToUploaded(array $files)
     {
-        if (!isset($files['file'])) {
-            return [];
-        }
         $uploadedFiles = [];
-        foreach ($files['file'] as $name => $value) {
-            if (is_array($name)) {
+        foreach ($files as $name => $value) {
+            if (is_array($value)) {
                 $uploadedFiles[$name] = self::convertFilesToUploaded($value);
                 continue;
             }
-            $uploadFiles[$name] = new UploadedFile(
-                $value['tmp_name'],
-                $value['size'],
-                $value['error'],
-                $value['name'],
-                $value['type']
+            return new UploadedFile(
+                $files['tmp_name'],
+                $files['size'],
+                $files['error'],
+                $files['name'],
+                $files['type']
             );
         }
         return $uploadedFiles;

diff --git a/test/Psr7ServerRequestTest.php b/test/Psr7ServerRequestTest.php
@@ -10,6 +10,7 @@
 namespace ZendTest\Psr7Bridge;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use Psr\Http\Message\UploadedFileInterface;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\UploadedFile;
 use Zend\Http\Header\Cookie;
@@ -247,19 +248,36 @@ public function getResponseData()
                         'test1' => [
                             'name' => 'test1.txt',
                             'type' => 'text/plain',
-                            'tmp_name' => '/tmp/phpXXX',
+                            'tmp_name' => __FILE__,
                             'error' => 0,
                             'size' => 1,
                         ],
                         'test2' => [
                             'name' => 'test2.txt',
                             'type' => 'text/plain',
-                            'tmp_name' => '/tmp/phpYYY',
+                            'tmp_name' => __FILE__,
                             'error' => 0,
                             'size' => 1,
                         ]
                     ]
                 ], // files
+            ],
+            [
+                'http://framework.zend.com/', // uri
+                'POST', // http method
+                [ 'Content-Type' => 'multipart/form-data' ], // headers
+                file_get_contents(__FILE__), // body
+                [ 'foo' => 'bar' ], // query params
+                [], // post
+                [
+                    'file' => [
+                        'name' => 'test2.txt',
+                        'type' => 'text/plain',
+                        'tmp_name' => __FILE__,
+                        'error' => 0,
+                        'size' => 1,
+                    ]
+                ], // files
             ]
         ];
     }
@@ -296,12 +314,27 @@ public function testFromZend($uri, $method, $headers, $body, $query, $post, $fil
         // post
         $this->assertEquals($post, $psr7Request->getParsedBody());
         // files
-        foreach ($psr7Request->getUploadedFiles() as $name => $upload) {
-            $this->assertEquals($files['file'][$name]['name'], $upload->getClientFilename());
-            $this->assertEquals($files['file'][$name]['type'], $upload->getClientMediaType());
-            $this->assertEquals($files['file'][$name]['size'], $upload->getSize());
-            $this->assertEquals($files['file'][$name]['tmp_name'], $upload->getStream());
-            $this->assertEquals($files['file'][$name]['error'], $upload->getError());
+        $this->compareUploadedFiles($files, $psr7Request->getUploadedFiles());
+    }
+
+    private function compareUploadedFiles($zend, $psr7)
+    {
+        if (! $psr7 instanceof UploadedFileInterface) {
+            $this->assertEquals(count($zend), count($psr7), 'number of files should be same');
+        }
+
+        foreach ($zend as $name => $value) {
+            if (is_array($value)) {
+                $this->compareUploadedFiles($zend[$name], $psr7[$name]);
+                continue;
+            }
+
+            $this->assertEquals($zend['name'], $psr7->getClientFilename());
+            $this->assertEquals($zend['type'], $psr7->getClientMediaType());
+            $this->assertEquals($zend['size'], $psr7->getSize());
+            $this->assertEquals($zend['tmp_name'], $psr7->getStream()->getMetadata('uri'));
+            $this->assertEquals($zend['error'], $psr7->getError());
+            break;
         }
     }