Merge branch 'hotfix/3600' into develop

Close #3600
zendframework · Jan 29, 2013 · 71a5bd8 · 71a5bd8
2 parents 8561cc4 + 161619c
commit 71a5bd8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 59 deletions.
diff --git a/tests/ZendTest/Filter/File/DecryptTest.php b/tests/ZendTest/Filter/File/DecryptTest.php
@@ -80,38 +80,6 @@ public function testBasic()
             trim(file_get_contents(dirname(__DIR__).'/_files/newencryption.txt')));
     }
 
-    /**
-     * @return void
-     */
-    public function testBasicWithFileArray()
-    {
-        $filter = new FileEncrypt();
-        $filter->setFilename(dirname(__DIR__).'/_files/newencryption.txt');
-
-        $this->assertEquals(
-            dirname(__DIR__).'/_files/newencryption.txt',
-            $filter->getFilename());
-
-        $filter->setVector('1234567890123456');
-        $filter->filter(array('tmp_name' => dirname(__DIR__).'/_files/encryption.txt'));
-
-        $filter = new FileDecrypt();
-
-        $this->assertNotEquals(
-            'Encryption',
-            file_get_contents(dirname(__DIR__).'/_files/newencryption.txt'));
-
-        $filter->setVector('1234567890123456');
-        $this->assertEquals(
-            array('tmp_name' => dirname(__DIR__).'/_files/newencryption.txt'),
-            $filter->filter(array('tmp_name' => dirname(__DIR__).'/_files/newencryption.txt'))
-        );
-
-        $this->assertEquals(
-            'Encryption',
-            trim(file_get_contents(dirname(__DIR__).'/_files/newencryption.txt')));
-    }
-
     public function testEncryptionWithDecryption()
     {
         $filter = new FileEncrypt();

diff --git a/tests/ZendTest/Filter/File/EncryptTest.php b/tests/ZendTest/Filter/File/EncryptTest.php
@@ -66,33 +66,6 @@ public function testBasic()
             file_get_contents(dirname(__DIR__).'/_files/newencryption.txt'));
     }
 
-    /**
-     * @return void
-     */
-    public function testBasicWithFileArray()
-    {
-        $filter = new FileEncrypt();
-        $filter->setFilename(dirname(__DIR__).'/_files/newencryption.txt');
-
-        $this->assertEquals(
-            dirname(__DIR__).'/_files/newencryption.txt',
-            $filter->getFilename());
-
-        $filter->setVector('1234567890123456');
-        $this->assertEquals(
-            array('tmp_name' => dirname(__DIR__).'/_files/newencryption.txt'),
-            $filter->filter(array('tmp_name' => dirname(__DIR__).'/_files/encryption.txt'))
-        );
-
-        $this->assertEquals(
-            'Encryption',
-            file_get_contents(dirname(__DIR__).'/_files/encryption.txt'));
-
-        $this->assertNotEquals(
-            'Encryption',
-            file_get_contents(dirname(__DIR__).'/_files/newencryption.txt'));
-    }
-
     public function testEncryptionWithDecryption()
     {
         $filter = new FileEncrypt();