diff options
| -rw-r--r-- | libs/Zend/Validate/Hostname.php | 1 | ||||
| -rw-r--r-- | tests/PHPUnit/Framework/TestRequest/Response.php | 1 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/EmailValidatorTest.php | 12 | ||||
| m--------- | tests/UI/expected-ui-screenshots | 0 |
4 files changed, 14 insertions, 0 deletions
diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php index 1ca10faea9..79e9902b6e 100644 --- a/libs/Zend/Validate/Hostname.php +++ b/libs/Zend/Validate/Hostname.php @@ -491,6 +491,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract '家電' => array(1 => self::VALID_UNICODE_DOMAIN), '微博' => array(1 => self::VALID_UNICODE_DOMAIN), 'ابوظبي' => array(1 => self::VALID_UNICODE_DOMAIN), + '网站' => array(1 => self::VALID_UNICODE_DOMAIN), ); diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php index 0f09a25b04..5dea087725 100644 --- a/tests/PHPUnit/Framework/TestRequest/Response.php +++ b/tests/PHPUnit/Framework/TestRequest/Response.php @@ -135,6 +135,7 @@ class Response 'visitorId', 'nextVisitorId', 'previousVisitorId', + 'idvisitor' ); return $this->removeXmlFields($apiResponse, $toRemove); diff --git a/tests/PHPUnit/Integration/EmailValidatorTest.php b/tests/PHPUnit/Integration/EmailValidatorTest.php index 22c95f86ee..2b9e9e82da 100644 --- a/tests/PHPUnit/Integration/EmailValidatorTest.php +++ b/tests/PHPUnit/Integration/EmailValidatorTest.php @@ -37,7 +37,17 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase return $tlds; } + private function skipTestIfIdnNotAvailable() + { + if (!function_exists('idn_to_utf8')) { + $this->markTestSkipped("Couldn't get TLD list"); + } + } + public function test_allCurrentTlds(){ + + $this->skipTestIfIdnNotAvailable(); + $tlds = $this->getAllTlds(); if (count($tlds) === 0) { $this->markTestSkipped("Couldn't get TLD list"); @@ -56,6 +66,8 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase } public function test_invalidTld(){ + $this->skipTestIfIdnNotAvailable(); + $tlds = [ strval(bin2hex(openssl_random_pseudo_bytes(64))), //generates 128 bit length string '-tld-cannot-start-from-hypen', diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots -Subproject efdf37166df977a737ff5aa68dd4871ee354b33 +Subproject be62f2dbf07061df357a562bd8af34fc2292bbe |