From 236dbc8eafc03779352b17be9e3b9e9ee63345b7 Mon Sep 17 00:00:00 2001 From: prolic Date: Fri, 20 Sep 2013 20:52:13 +0200 Subject: [PATCH 1/5] remove further test files --- .../zf2/tests/ZendTest/Filter/_files/zipextracted.txt | 1 - .../Projects/zf2/tests/ZendTest/Filter/_files/zipextracted.txt | 1 - 2 files changed, 2 deletions(-) delete mode 100644 test/_files/Users/francis/Sites/projects/zend-framework/zf2/tests/ZendTest/Filter/_files/zipextracted.txt delete mode 100644 test/_files/media/Projects/zf2/tests/ZendTest/Filter/_files/zipextracted.txt diff --git a/test/_files/Users/francis/Sites/projects/zend-framework/zf2/tests/ZendTest/Filter/_files/zipextracted.txt b/test/_files/Users/francis/Sites/projects/zend-framework/zf2/tests/ZendTest/Filter/_files/zipextracted.txt deleted file mode 100644 index da95ad08..00000000 --- a/test/_files/Users/francis/Sites/projects/zend-framework/zf2/tests/ZendTest/Filter/_files/zipextracted.txt +++ /dev/null @@ -1 +0,0 @@ -compress me diff --git a/test/_files/media/Projects/zf2/tests/ZendTest/Filter/_files/zipextracted.txt b/test/_files/media/Projects/zf2/tests/ZendTest/Filter/_files/zipextracted.txt deleted file mode 100644 index 048d9aed..00000000 --- a/test/_files/media/Projects/zf2/tests/ZendTest/Filter/_files/zipextracted.txt +++ /dev/null @@ -1 +0,0 @@ -compress me \ No newline at end of file From b0eaac005d59d844d551f7719fdca9c4a172fea2 Mon Sep 17 00:00:00 2001 From: Alex Brausewetter Date: Fri, 27 Sep 2013 16:43:49 +0200 Subject: [PATCH 2/5] Fix trailing spaces CS --- test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php | 2 +- test/Word/CamelCaseToSeparatorTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php b/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php index 39946a3c..5efb3860 100644 --- a/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php +++ b/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php @@ -15,7 +15,7 @@ use Zend\Stdlib\StringUtils; /** - * Test class for Zend\Filter\Word\CamelCaseToSeparator which simulates the + * Test class for Zend\Filter\Word\CamelCaseToSeparator which simulates the * PCRE Unicode features disabled */ class CamelCaseToSeparatorNoPcreUnicodeTest extends CamelCaseToSeparatorTest diff --git a/test/Word/CamelCaseToSeparatorTest.php b/test/Word/CamelCaseToSeparatorTest.php index 95654669..cf59ead4 100644 --- a/test/Word/CamelCaseToSeparatorTest.php +++ b/test/Word/CamelCaseToSeparatorTest.php @@ -41,7 +41,7 @@ public function testFilterSeparatesCamelCasedWordsWithProvidedSeparator() $this->assertNotEquals($string, $filtered); $this->assertEquals('Camel:-#Cased:-#Words', $filtered); } - + public function testFilterSeperatesMultipleUppercasedLettersAndUnderscores() { $string = 'TheseAre_SOME_CamelCASEDWords'; From ca0067cb54d4c6980fdc48e83b8455efc01dfb68 Mon Sep 17 00:00:00 2001 From: Alex Brausewetter Date: Tue, 1 Oct 2013 13:15:22 +0200 Subject: [PATCH 3/5] CS: Remove @package tag --- test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php b/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php index 5efb3860..8f6224c9 100644 --- a/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php +++ b/test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php @@ -5,7 +5,6 @@ * @link http://github.com/zendframework/zf2 for the canonical source repository * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @package Zend_Filter */ namespace ZendTest\Filter\Word; From a2a4d7a9fabbc565d79714d6d30313795a44f2c7 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 22 Oct 2013 16:39:40 -0500 Subject: [PATCH 4/5] [zendframework/zf2#5108] Remove errant file - should not have been committed --- .../dev/zf2/tests/ZendTest/Filter/_files/zipextracted.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test/_files/home/dasprid/dev/zf2/tests/ZendTest/Filter/_files/zipextracted.txt diff --git a/test/_files/home/dasprid/dev/zf2/tests/ZendTest/Filter/_files/zipextracted.txt b/test/_files/home/dasprid/dev/zf2/tests/ZendTest/Filter/_files/zipextracted.txt deleted file mode 100644 index 048d9aed..00000000 --- a/test/_files/home/dasprid/dev/zf2/tests/ZendTest/Filter/_files/zipextracted.txt +++ /dev/null @@ -1 +0,0 @@ -compress me \ No newline at end of file From efad1431f3261c7358e6eb073b7e3698a5e2dcc8 Mon Sep 17 00:00:00 2001 From: Martin Keckeis Date: Mon, 28 Oct 2013 14:16:39 +0100 Subject: [PATCH 5/5] ZendTest\Filter: assertRegExp bugfixes for windows see here: http://www.php.net/manual/de/function.preg-match.php#101575 --- test/File/RenameTest.php | 4 ++-- test/File/RenameUploadTest.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/File/RenameTest.php b/test/File/RenameTest.php index c8ede317..a947a9c2 100644 --- a/test/File/RenameTest.php +++ b/test/File/RenameTest.php @@ -491,7 +491,7 @@ public function testGetRandomizedFile() $filter->getFile() ); $fileNoExt = $this->_filesPath . 'newfile'; - $this->assertRegExp('#' . $fileNoExt . '_.{13}\.xml#', $filter->getNewName($this->_oldFile)); + $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.xml#', $filter->getNewName($this->_oldFile)); } /** @@ -515,7 +515,7 @@ public function testGetRandomizedFileWithoutExtension() )), $filter->getFile() ); - $this->assertRegExp('#' . $fileNoExt . '_.{13}#', $filter->getNewName($this->_oldFile)); + $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}#', $filter->getNewName($this->_oldFile)); } /** diff --git a/test/File/RenameUploadTest.php b/test/File/RenameUploadTest.php index 92128ebf..75bc106b 100644 --- a/test/File/RenameUploadTest.php +++ b/test/File/RenameUploadTest.php @@ -245,18 +245,18 @@ public function testCannotOverwriteExistingFile() */ public function testGetRandomizedFile() { - $fileNoExt = $this->_filesPath . '/newfile'; + $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile'; $filter = new RenameUploadMock(array( 'target' => $this->_newFile, 'randomize' => true, )); - $this->assertRegExp('#' . $fileNoExt . '_.{13}\.xml#', $filter($this->_oldFile)); + $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.xml#', $filter($this->_oldFile)); } public function testGetFileWithOriginalExtension() { - $fileNoExt = $this->_filesPath . '/newfile'; + $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile'; $filter = new RenameUploadMock(array( 'target' => $this->_newFile, 'use_upload_extension' => true, @@ -266,14 +266,14 @@ public function testGetFileWithOriginalExtension() $oldFilePathInfo = pathinfo($this->_oldFile); $this->assertRegExp( - '#' . $fileNoExt . '.'.$oldFilePathInfo['extension'].'#', + '#' . str_replace('\\', '\\\\', $fileNoExt) . '.'.$oldFilePathInfo['extension'].'#', $filter($this->_oldFile) ); } public function testGetRandomizedFileWithOriginalExtension() { - $fileNoExt = $this->_filesPath . '/newfile'; + $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile'; $filter = new RenameUploadMock(array( 'target' => $this->_newFile, 'use_upload_extension' => true, @@ -283,7 +283,7 @@ public function testGetRandomizedFileWithOriginalExtension() $oldFilePathInfo = pathinfo($this->_oldFile); $this->assertRegExp( - '#' . $fileNoExt . '_.{13}\.'.$oldFilePathInfo['extension'].'#', + '#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}\.'.$oldFilePathInfo['extension'].'#', $filter($this->_oldFile) ); } @@ -293,13 +293,13 @@ public function testGetRandomizedFileWithOriginalExtension() */ public function testGetRandomizedFileWithoutExtension() { - $fileNoExt = $this->_filesPath . '/newfile'; + $fileNoExt = $this->_filesPath . DIRECTORY_SEPARATOR . 'newfile'; $filter = new RenameUploadMock(array( 'target' => $fileNoExt, 'randomize' => true, )); - $this->assertRegExp('#' . $fileNoExt . '_.{13}#', $filter($this->_oldFile)); + $this->assertRegExp('#' . str_replace('\\', '\\\\', $fileNoExt) . '_.{13}#', $filter($this->_oldFile)); } /**