From ba8a258f4be33e037c77ae2b0e4a79b95e71a559 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Wed, 13 Jun 2012 18:36:08 +0200 Subject: [PATCH 1/2] [Validator] Set locale when test is executed with PHP <5.3.4 --- test/RegexTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/RegexTest.php b/test/RegexTest.php index 8d6f0e4f7..4f4b9635e 100644 --- a/test/RegexTest.php +++ b/test/RegexTest.php @@ -108,7 +108,7 @@ public function testNonStringValidation() public function testSpecialCharValidation($expected, $input) { // Locale changed due a bug with PHP versions lower than 5.3.4 (https://bugs.php.net/bug.php?id=52971) - setlocale(LC_ALL, 'es_ES'); + setlocale(LC_ALL, 'Spanish_Spain', 'es_ES', 'es_ES.utf-8'); $validator = new Validator\Regex('/^[[:alpha:]\']+$/iu'); $this->assertEquals($expected, $validator->isValid($input), 'Reason: ' . implode('', $validator->getMessages())); From afe0b149acdf941e3f1d7cb740b4ce1e2aa01808 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Wed, 13 Jun 2012 20:02:20 +0200 Subject: [PATCH 2/2] [Validator] Skip test is executed with PHP <5.3.4 - Travis-Ci doesn't support use a different locale as workaround --- test/RegexTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/RegexTest.php b/test/RegexTest.php index 4f4b9635e..f53eee427 100644 --- a/test/RegexTest.php +++ b/test/RegexTest.php @@ -108,7 +108,11 @@ public function testNonStringValidation() public function testSpecialCharValidation($expected, $input) { // Locale changed due a bug with PHP versions lower than 5.3.4 (https://bugs.php.net/bug.php?id=52971) - setlocale(LC_ALL, 'Spanish_Spain', 'es_ES', 'es_ES.utf-8'); + //setlocale(LC_ALL, 'Spanish_Spain', 'es_ES', 'es_ES.utf-8'); + if (version_compare(PHP_VERSION, '5.3.4', '<')) { + $this->markTestIncomplete( // Skipped because Travis-CI PHP 5.3.3 don't allow set the locale + "Test skipped because the PHP version is lower than 5.3.4 or the environment don't support quoted characters"); + } $validator = new Validator\Regex('/^[[:alpha:]\']+$/iu'); $this->assertEquals($expected, $validator->isValid($input), 'Reason: ' . implode('', $validator->getMessages()));