[ZF-6408, ZF-6819, ZF-6851] Zend_File_Transfer:

 - allow to use Rename filter without set target
 - allow to use Rename filter only with filename set by using path from http adapter

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16009 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/File/Transfer/Adapter/Http.php

@@ -160,8 +160,16 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac
                 $filename = $directory . $content['name'];
                 $rename   = $this->getFilter('Rename');
                 if ($rename !== null) {
-                    $filename = $rename->getNewName($content['tmp_name']);
-                    $key      = array_search(get_class($rename), $this->_files[$file]['filters']);
+                    $tmp = $rename->getNewName($content['tmp_name']);
+                    if ($tmp != $content['tmp_name']) {
+                        $filename = $tmp;
+                    }
+
+                    if (dirname($filename) == '.') {
+                        $filename = $directory . $filename;
+                    }
+
+                    $key = array_search(get_class($rename), $this->_files[$file]['filters']);
                     unset($this->_files[$file]['filters'][$key]);
                 }
 

tests/Zend/File/Transfer/Adapter/HttpTest.php

@@ -140,6 +140,14 @@ class Zend_File_Transfer_Adapter_HttpTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($this->adapter->receive());
     }
 
+    public function testReceiveWithRenameFilterButWithoutDirectory()
+    {
+        $this->adapter->setDestination(dirname(__FILE__));
+        $this->adapter->addFilter('Rename', array('overwrite' => false));
+        $this->adapter->setOptions(array('ignoreNoFile' => true));
+        $this->assertTrue($this->adapter->receive());
+    }
+
     public function testMultiFiles()
     {
         $_FILES = array(