Merge branch 'hotfix/82'

Close #87
Fixes #82

Author: weierophinney

CHANGELOG.md

@@ -30,6 +30,9 @@ All notable changes to this project will be documented in this file, in reverse
   Previously, several simply passed non-string input on verbatim, others
   normalized the input, and a few correctly raised the exceptions. Behavior is
   now consistent across each.
+- [#87](https://github.com/zendframework/zend-diactoros/pull/87) fixes
+  `UploadedFile` to ensure that `moveTo()` works correctly in non-SAPI
+  environments when the file provided to the constructor is a path.
 
 ## 1.1.2 - 2015-07-12
 

src/UploadedFile.php

@@ -223,9 +223,10 @@ private function writeFile($path)
             throw new RuntimeException('Unable to write to designated path');
         }
 
-        $this->stream->rewind();
-        while (! $this->stream->eof()) {
-            fwrite($handle, $this->stream->read(4096));
+        $stream = $this->getStream();
+        $stream->rewind();
+        while (! $stream->eof()) {
+            fwrite($handle, $stream->read(4096));
         }
 
         fclose($handle);

test/UploadedFileTest.php

@@ -270,4 +270,20 @@ public function testGetStreamRaisesExceptionWhenErrorStatusPresent($status)
         $this->setExpectedException('RuntimeException', 'upload error');
         $stream = $uploadedFile->getStream();
     }
+
+    /**
+     * @group 82
+     */
+    public function testMoveToCreatesStreamIfOnlyAFilenameWasProvided()
+    {
+        $this->tmpFile = tempnam(sys_get_temp_dir(), 'DIA');
+
+        $uploadedFile = new UploadedFile(__FILE__, 100, UPLOAD_ERR_OK, basename(__FILE__), 'text/plain');
+        $uploadedFile->moveTo($this->tmpFile);
+
+        $original = file_get_contents(__FILE__);
+        $test     = file_get_contents($this->tmpFile);
+
+        $this->assertEquals($original, $test);
+    }
 }