mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-10-08 21:26:20 +02:00
parent f29eebc629 0417599344
commit 63e0b1b2f3
3 changed files with 225 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
tests/functions/make_clickable_test.php
View File

@@ -27,131 +27,173 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
**/
public function data_test_make_clickable_url_positive()
{
return array(
array(
return [
[
'http://www.phpbb.com/community/',
'<!-- m --><a class="postlink" href="http://www.phpbb.com/community/">http://www.phpbb.com/community/</a><!-- m -->'
),
array(
],
[
'http://www.phpbb.com/path/file.ext#section',
'<!-- m --><a class="postlink" href="http://www.phpbb.com/path/file.ext#section">http://www.phpbb.com/path/file.ext#section</a><!-- m -->'
),
array(
],
[
'ftp://ftp.phpbb.com/',
'<!-- m --><a class="postlink" href="ftp://ftp.phpbb.com/">ftp://ftp.phpbb.com/</a><!-- m -->'
),
array(
],
[
'sip://bantu@phpbb.com',
'<!-- m --><a class="postlink" href="sip://bantu@phpbb.com">sip://bantu@phpbb.com</a><!-- m -->'
),
array(
],
[
'www.phpbb.com/community/',
'<!-- w --><a class="postlink" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->'
),
array(
],
[
'http://testhost/viewtopic.php?t=1',
'<!-- l --><a class="postlink-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
),
array(
],
[
'javascript://testhost/viewtopic.php?t=1',
'javascript://testhost/viewtopic.php?t=1'
),
array(
],
[
"java\nscri\npt://testhost/viewtopic.php?t=1",
"java\nscri\n<!-- m --><a class=\"postlink\" href=\"pt://testhost/viewtopic.php?t=1\">pt://testhost/viewtopic.php?t=1</a><!-- m -->"
),
array(
],
[
'email@domain.com',
'<!-- e --><a href="mailto:email@domain.com">email@domain.com</a><!-- e -->'
),
],
// Test appending punctuation mark to the URL
array(
[
'http://testhost/viewtopic.php?t=1!',
'<!-- l --><a class="postlink-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->!'
),
array(
],
[
'www.phpbb.com/community/?',
'<!-- w --><a class="postlink" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->?'
),
],
// Test shortened text for URL > 55 characters long
// URL text should be turned into: first 39 chars + ' ... ' + last 10 chars
array(
[
'http://www.phpbb.com/community/path/to/long/url/file.ext#section',
'<!-- m --><a class="postlink" href="http://www.phpbb.com/community/path/to/long/url/file.ext#section">http://www.phpbb.com/community/path/to/ ... xt#section</a><!-- m -->'
),
);
],
];
}
public function data_test_make_clickable_url_idn()
{
return array(
array(
return [
[
'http://www.täst.de/community/',
'<!-- m --><a class="postlink" href="http://www.täst.de/community/">http://www.täst.de/community/</a><!-- m -->'
),
array(
],
[
'http://www.täst.de/path/file.ext#section',
'<!-- m --><a class="postlink" href="http://www.täst.de/path/file.ext#section">http://www.täst.de/path/file.ext#section</a><!-- m -->'
),
array(
],
[
'ftp://ftp.täst.de/',
'<!-- m --><a class="postlink" href="ftp://ftp.täst.de/">ftp://ftp.täst.de/</a><!-- m -->'
),
array(
],
[
'javascript://täst.de/',
'javascript://täst.de/'
),
array(
],
[
'sip://bantu@täst.de',
'<!-- m --><a class="postlink" href="sip://bantu@täst.de">sip://bantu@täst.de</a><!-- m -->'
),
array(
],
[
'www.täst.de/community/',
'<!-- w --><a class="postlink" href="http://www.täst.de/community/">www.täst.de/community/</a><!-- w -->'
),
],
// Test appending punctuation mark to the URL
array(
[
'http://домен.рф/viewtopic.php?t=1!',
'<!-- m --><a class="postlink" href="http://домен.рф/viewtopic.php?t=1">http://домен.рф/viewtopic.php?t=1</a><!-- m -->!'
),
array(
],
[
'www.домен.рф/сообщество/?',
'<!-- w --><a class="postlink" href="http://www.домен.рф/сообщество/">www.домен.рф/сообщество/</a><!-- w -->?'
),
],
// Test shortened text for URL > 55 characters long
// URL text should be turned into: first 39 chars + ' ... ' + last 10 chars
array(
[
'http://www.домен.рф/сообщество/путь/по/длинной/ссылке/file.ext#section',
'<!-- m --><a class="postlink" href="http://www.домен.рф/сообщество/путь/по/длинной/ссылке/file.ext#section">http://www.домен.рф/сообщество/путь/по/ ... xt#section</a><!-- m -->'
),
],
// IDN with invalid characters shouldn't be parsed correctly (only 'valid' part)
array(
[
'http://www.täst╫.de',
'<!-- m --><a class="postlink" href="http://www.täst">http://www.täst</a><!-- m -->╫.de'
),
],
// IDN in emails is unsupported yet
array('почта@домен.рф', 'почта@домен.рф'),
);
['почта@домен.рф', 'почта@домен.рф'],
];
}
public function data_test_make_clickable_local_url_idn()
{
return array(
array(
return [
[
'http://www.домен.рф/viewtopic.php?t=1',
'<!-- l --><a class="postlink-local" href="http://www.домен.рф/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
),
],
// Test appending punctuation mark to the URL
array(
[
'http://www.домен.рф/viewtopic.php?t=1!',
'<!-- l --><a class="postlink-local" href="http://www.домен.рф/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->!'
),
array(
],
[
'http://www.домен.рф/сообщество/?',
'<!-- l --><a class="postlink-local" href="http://www.домен.рф/сообщество/">сообщество/</a><!-- l -->?'
),
);
],
];
}
public function data_test_make_clickable_custom_classes()
{
return [
[
'http://www.домен.рф/viewtopic.php?t=1',
'http://www.домен.рф',
'class1',
'<!-- l --><a class="class1-local" href="http://www.домен.рф/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
],
[
'http://www.домен.рф/viewtopic.php?t=1!',
false,
'class2',
'<!-- m --><a class="class2" href="http://www.домен.рф/viewtopic.php?t=1">http://www.домен.рф/viewtopic.php?t=1</a><!-- m -->!'
],
[
'http://www.домен.рф/сообщество/?',
false,
'class3',
'<!-- m --><a class="class3" href="http://www.домен.рф/сообщество/">http://www.домен.рф/сообщество/</a><!-- m -->?'
],
[
'www.phpbb.com/community/',
false,
'class2',
'<!-- w --><a class="class2" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->'
],
[
'http://testhost/viewtopic.php?t=1',
false,
'class1',
'<!-- l --><a class="class1-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
],
[
'email@domain.com',
false,
'class-email',
'<!-- e --><a href="mailto:email@domain.com">email@domain.com</a><!-- e -->'
],
];
}
protected function setUp(): void
@@ -166,16 +208,9 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
/**
* @dataProvider data_test_make_clickable_url_positive
*/
public function test_urls_matching_positive($url, $expected)
{
$this->assertSame($expected, make_clickable($url));
}
/**
* @dataProvider data_test_make_clickable_url_idn
*/
public function test_urls_matching_idn($url, $expected)
public function test_urls_matching_positive($url, $expected)
{
$this->assertSame($expected, make_clickable($url));
}
@@ -187,4 +222,12 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
{
$this->assertSame($expected, make_clickable($url, "http://www.домен.рф"));
}
/**
* @dataProvider data_test_make_clickable_custom_classes
*/
public function test_make_clickable_custom_classes($url, $server_url, $class, $expected)
{
$this->assertSame($expected, make_clickable($url, $server_url, $class));
}
}