RenameUpload returns a new instance of UploadedFile so that

 - can still be used in request handlers or other validators in the chain
 - reading off what new filename was generated by the filter options.

composer.json

@@ -18,14 +18,14 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "psr/http-message": "^1.0",
+        "zendframework/zend-diactoros": "^1.8",
         "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
     },
     "require-dev": {
         "pear/archive_tar": "^1.4.3",
         "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-crypt": "^3.2.1",
-        "zendframework/zend-diactoros": "^1.8",
         "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
         "zendframework/zend-uri": "^2.6"
     },

src/File/RenameUpload.php

@@ -10,6 +10,7 @@
 namespace Zend\Filter\File;
 
 use Psr\Http\Message\UploadedFileInterface;
+use Zend\Diactoros\UploadedFile;
 use Zend\Filter\AbstractFilter;
 use Zend\Filter\Exception;
 use Zend\Stdlib\ErrorHandler;
@@ -202,7 +203,13 @@ public function filter($value)
         $return = $targetFile;
         if ($isFileUpload) {
             if ($value instanceof UploadedFileInterface) {
-                $return = $value;
+                $return = new UploadedFile(
+                    $targetFile,
+                    filesize($targetFile),
+                    UPLOAD_ERR_OK,
+                    $value->getClientFilename(),
+                    $value->getClientMediaType()
+                );
             } else {
                 $return = [
                     'tmp_name' => $clientFilename,
@@ -256,7 +263,9 @@ protected function checkFileExists($targetFile)
     }
 
     /**
-     * @param  array $uploadData $_FILES array
+     * @param $source
+     * @param $clientFileName
+     *
      * @return string
      */
     protected function getFinalTarget($source, $clientFileName)

test/File/RenameUploadTest.php

@@ -177,14 +177,26 @@ public function testStringConstructorWithPsrFile()
         $filter = new RenameUploadMock($this->targetFile);
         $this->assertEquals($this->targetFile, $filter->getTarget());
 
-        /** @var UploadedFile $moved */
         $moved = $filter(new UploadedFile(
             $this->sourceFile,
             1,
             0,
             $this->targetFile
         ));
-        $this->expectExceptionMessage('Cannot retrieve stream after it has already been moved');
+
+        /** @var UploadedFile $moved */
+        $this->assertEquals(
+            new UploadedFile(
+                $this->targetFile,
+                0,
+                0,
+                $this->targetFile
+            ),
+            $moved
+        );
+
+        // exception should NOT be thrown.
+        // Moved file in real application will be used by request handlers.
         $moved->getStream();
         $this->assertEquals('falsefile', $filter('falsefile'));
     }