mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-10-11 21:00:38 +02:00
parent 0e6a0aae8f 2c01fe67e9
commit d64ce15ecf
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/functions/make_clickable_email_test.php
View File

@@ -17,9 +17,10 @@ class phpbb_functions_make_clickable_email_test extends phpbb_test_case
{
parent::setUp();
global $config, $user, $request;
global $config, $user, $request, $symfony_request;
$user = new phpbb_mock_user();
$request = new phpbb_mock_request();
$symfony_request = new \phpbb\symfony_request($request);
}
/**
@@ -168,7 +169,7 @@ class phpbb_functions_make_clickable_email_test extends phpbb_test_case
array('abc,def@example.com'), // invalid character ,
array('abc<def@example.com'), // invalid character <
array('abc>def@example.com', 'abc><!-- e --><a href="mailto:def@example.com">def@example.com</a><!-- e -->'), // invalid character >
// http://fightingforalostcause.net/misc/2006/compare-email-regex.php
array('missingDomain@.com'),
array('@missingLocal.org'),

3
tests/functions/make_clickable_test.php
View File

@@ -146,9 +146,10 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
{
parent::setUp();
global $config, $user, $request;
global $config, $user, $request, $symfony_request;
$user = new phpbb_mock_user();
$request = new phpbb_mock_request();
$symfony_request = new \phpbb\symfony_request($request);
}
/**