aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-05-31 15:30:05 +0200
committerNils Adermann <naderman@naderman.de>2012-05-31 15:30:05 +0200
commit4a5004781aeb8638a0993476c77035d5311500a8 (patch)
tree087e371d580ec1136bffacb4864bf50f75811d63 /tests
parent1b73f824303e484b466e3b5db613eb18768530ff (diff)
parentf6f300d3f9366a2c63e1b2dc4d8f35574c51ed4b (diff)
downloadforums-4a5004781aeb8638a0993476c77035d5311500a8.tar
forums-4a5004781aeb8638a0993476c77035d5311500a8.tar.gz
forums-4a5004781aeb8638a0993476c77035d5311500a8.tar.bz2
forums-4a5004781aeb8638a0993476c77035d5311500a8.tar.xz
forums-4a5004781aeb8638a0993476c77035d5311500a8.zip
Merge branch 'develop-olympus' into develop
By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10162] Increase maximum length of email address TLD from 6 to 63. [ticket/10162] Add test cases for top level domain names longer than 6 chars.
Diffstat (limited to 'tests')
-rw-r--r--tests/regex/email_test.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index 17f93259c3..b4ea5b23aa 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -28,6 +28,8 @@ class phpbb_regex_email_test extends phpbb_test_case
array('alice_foo@bar.phpbb.com'),
array('alice+tag@foo.phpbb.com'),
array('alice&amp;tag@foo.phpbb.com'),
+ array('alice@phpbb.australia'),
+ array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlong'),
//array('"John Doe"@example.com'),
//array('Alice@[192.168.2.1]'), // IPv4
@@ -96,6 +98,7 @@ class phpbb_regex_email_test extends phpbb_test_case
array('! "#$%(),/;<>[]`|@invalidCharsInLocal.org'),
array('invalidCharsInDomain@! "#$%(),/;<>_[]`|.org'),
array('local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org'),
+ array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlongZ'),
);
}