Merge branch 'hotfix/79' into develop

Forward port #79

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.9.1 - TBD
+## 2.9.1 - 2018-12-17
 
 ### Added
 
@@ -44,7 +44,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#79](https://github.com/zendframework/zend-filter/pull/79) fixes a regression introduced in 2.9.0 when using
+  `Zend\Filter\File\RenameUpload` via the traditional SAPI.
 
 ## 2.9.0 - 2018-12-12
 

src/File/RenameUpload.php

@@ -373,16 +373,14 @@ private function filterSapiUploadedFile(array $fileData)
 
         $targetFile = $this->getFinalTarget($sourceFile, $clientFilename);
         if ($sourceFile === $targetFile || ! file_exists($sourceFile)) {
-            return $value;
+            return $fileData;
         }
 
         $this->checkFileExists($targetFile);
         $this->moveUploadedFile($sourceFile, $targetFile);
 
-        $this->alreadyFiltered[$sourceFile] = [
-            'tmp_name' => $clientFilename,
-            'name'     => $targetFile,
-        ];
+        $this->alreadyFiltered[$sourceFile] = $fileData;
+        $this->alreadyFiltered[$sourceFile]['tmp_name'] = $targetFile;
 
         return $this->alreadyFiltered[$sourceFile];
     }

test/File/RenameUploadTest.php

@@ -412,4 +412,50 @@ public function testReturnUnfiltered($input)
 
         $this->assertEquals($input, $filter($input));
     }
+
+    /**
+     * @see https://github.com/zendframework/zend-filter/issues/77
+     * @return void
+     */
+    public function testCachesResultsOfFilteringSAPIUploads()
+    {
+        $filter = new RenameUploadMock($this->targetPath);
+
+        // Emulate the output of \Zend\Http\Request::getFiles()->toArray()
+        $sapiSource = [
+            'tmp_name' => $this->sourceFile,
+            'name' => basename($this->targetFile),
+            'type' => 'text/plain',
+            'error' => \UPLOAD_ERR_OK,
+            'size' => 123,
+        ];
+
+        $sapiTarget = [
+            'tmp_name' => $this->targetPathFile,
+            'name' => basename($this->targetFile),
+            'type' => 'text/plain',
+            'error' => \UPLOAD_ERR_OK,
+            'size' => 123,
+        ];
+
+        // Check the result twice for the `alreadyFiltered` cache path
+        $this->assertEquals($sapiTarget, $filter($sapiSource));
+        $this->assertEquals($sapiTarget, $filter($sapiSource));
+    }
+
+    /**
+     * @see https://github.com/zendframework/zend-filter/issues/76
+     * @return void
+     */
+    public function testFilterReturnsFileDataVerbatimUnderSAPIWhenNameAndTmpNameDiffer()
+    {
+        $filter = new RenameUploadMock();
+
+        $source = [
+            'tmp_name' => $this->sourceFile,
+            'name' => basename($this->targetFile),
+        ];
+
+        $this->assertEquals($source, $filter($source));
+    }
 }