29951907f7
Before r39373, all autocomments in an edit summary were formatted. In fixing a bug with page titles containing "/*" this was accidentally broken. To use a single preg_replace_callback call to replace multiple autocomments, we need to make sure that the match of one autocomment doesn't overlap the match of another, which means we can't have "(.*)" before and after. But we do still need to detect whether there is anything before or after. "(?=(.?))" and "(?<=(.?))" would do nicely, except the latter isn't actually supported. "(?=(.))?" and "(?<=(.))?" work too, but older versions of PCRE don't support that. They do, however, support "(?:(?=(.)))?" and "(?:(?<=(.)))?", so that's what we'll go with. This change does change the values for $pre and $post passed to the FormatAutocomments hook; extensions need to be updated to accept (and not prepend/append) booleans for these parameters. Bug: T18530 Bug: T70361 Change-Id: I36c3a9e548a4ef72f93974bb35f9add8c29e9287
196 lines
6.6 KiB
PHP
196 lines
6.6 KiB
PHP
<?php
|
||
|
||
/**
|
||
* @group Database
|
||
*/
|
||
|
||
class LinkerTest extends MediaWikiLangTestCase {
|
||
|
||
/**
|
||
* @dataProvider provideCasesForUserLink
|
||
* @covers Linker::userLink
|
||
*/
|
||
public function testUserLink( $expected, $userId, $userName, $altUserName = false, $msg = '' ) {
|
||
$this->setMwGlobals( array(
|
||
'wgArticlePath' => '/wiki/$1',
|
||
'wgWellFormedXml' => true,
|
||
) );
|
||
|
||
$this->assertEquals( $expected,
|
||
Linker::userLink( $userId, $userName, $altUserName, $msg )
|
||
);
|
||
}
|
||
|
||
public static function provideCasesForUserLink() {
|
||
# Format:
|
||
# - expected
|
||
# - userid
|
||
# - username
|
||
# - optional altUserName
|
||
# - optional message
|
||
return array(
|
||
|
||
### ANONYMOUS USER ########################################
|
||
array(
|
||
'<a href="/wiki/Special:Contributions/JohnDoe" '
|
||
. 'title="Special:Contributions/JohnDoe" '
|
||
. 'class="mw-userlink mw-anonuserlink">JohnDoe</a>',
|
||
0, 'JohnDoe', false,
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:Contributions/::1" '
|
||
. 'title="Special:Contributions/::1" '
|
||
. 'class="mw-userlink mw-anonuserlink">::1</a>',
|
||
0, '::1', false,
|
||
'Anonymous with pretty IPv6'
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:Contributions/0:0:0:0:0:0:0:1" '
|
||
. 'title="Special:Contributions/0:0:0:0:0:0:0:1" '
|
||
. 'class="mw-userlink mw-anonuserlink">::1</a>',
|
||
0, '0:0:0:0:0:0:0:1', false,
|
||
'Anonymous with almost pretty IPv6'
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:Contributions/0000:0000:0000:0000:0000:0000:0000:0001" '
|
||
. 'title="Special:Contributions/0000:0000:0000:0000:0000:0000:0000:0001" '
|
||
. 'class="mw-userlink mw-anonuserlink">::1</a>',
|
||
0, '0000:0000:0000:0000:0000:0000:0000:0001', false,
|
||
'Anonymous with full IPv6'
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:Contributions/::1" '
|
||
. 'title="Special:Contributions/::1" '
|
||
. 'class="mw-userlink mw-anonuserlink">AlternativeUsername</a>',
|
||
0, '::1', 'AlternativeUsername',
|
||
'Anonymous with pretty IPv6 and an alternative username'
|
||
),
|
||
|
||
# IPV4
|
||
array(
|
||
'<a href="/wiki/Special:Contributions/127.0.0.1" '
|
||
. 'title="Special:Contributions/127.0.0.1" '
|
||
. 'class="mw-userlink mw-anonuserlink">127.0.0.1</a>',
|
||
0, '127.0.0.1', false,
|
||
'Anonymous with IPv4'
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:Contributions/127.0.0.1" '
|
||
. 'title="Special:Contributions/127.0.0.1" '
|
||
. 'class="mw-userlink mw-anonuserlink">AlternativeUsername</a>',
|
||
0, '127.0.0.1', 'AlternativeUsername',
|
||
'Anonymous with IPv4 and an alternative username'
|
||
),
|
||
|
||
### Regular user ##########################################
|
||
# TODO!
|
||
);
|
||
}
|
||
|
||
/**
|
||
* @dataProvider provideCasesForFormatComment
|
||
* @covers Linker::formatComment
|
||
* @covers Linker::formatAutocomments
|
||
* @covers Linker::formatLinksInComment
|
||
*/
|
||
public function testFormatComment( $expected, $comment, $title = false, $local = false ) {
|
||
$this->setMwGlobals( array(
|
||
'wgScript' => '/wiki/index.php',
|
||
'wgArticlePath' => '/wiki/$1',
|
||
'wgWellFormedXml' => true,
|
||
'wgCapitalLinks' => true,
|
||
) );
|
||
|
||
if ( $title === false ) {
|
||
// We need a page title that exists
|
||
$title = Title::newFromText( 'Special:BlankPage' );
|
||
}
|
||
|
||
$this->assertEquals(
|
||
$expected,
|
||
Linker::formatComment( $comment, $title, $local )
|
||
);
|
||
}
|
||
|
||
public static function provideCasesForFormatComment() {
|
||
return array(
|
||
// Linker::formatComment
|
||
array(
|
||
'a<script>b',
|
||
'a<script>b',
|
||
),
|
||
array(
|
||
'a—b',
|
||
'a—b',
|
||
),
|
||
array(
|
||
"'''not bolded'''",
|
||
"'''not bolded'''",
|
||
),
|
||
// Linker::formatAutocomments
|
||
array(
|
||
'<a href="/wiki/Special:BlankPage#autocomment" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment">autocomment</span></span>',
|
||
"/* autocomment */",
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:BlankPage#linkie.3F" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment"><a href="/wiki/index.php?title=Linkie%3F&action=edit&redlink=1" class="new" title="Linkie? (page does not exist)">linkie?</a></span></span>',
|
||
"/* [[linkie?]] */",
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:BlankPage#autocomment" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment">autocomment: </span> post</span>',
|
||
"/* autocomment */ post",
|
||
),
|
||
array(
|
||
'pre <a href="/wiki/Special:BlankPage#autocomment" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment">autocomment</span></span>',
|
||
"pre /* autocomment */",
|
||
),
|
||
array(
|
||
'pre <a href="/wiki/Special:BlankPage#autocomment" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment">autocomment: </span> post</span>',
|
||
"pre /* autocomment */ post",
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:BlankPage#autocomment" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment">autocomment: </span> multiple? <a href="/wiki/Special:BlankPage#autocomment2" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment">autocomment2: </span> </span></span>',
|
||
"/* autocomment */ multiple? /* autocomment2 */ ",
|
||
),
|
||
array(
|
||
'<a href="/wiki/Special:BlankPage#autocomment_containing_.2F.2A" title="Special:BlankPage">→</a><span dir="auto"><span class="autocomment">autocomment containing /*: </span> T70361</span>',
|
||
"/* autocomment containing /* */ T70361"
|
||
),
|
||
array(
|
||
'<a href="#autocomment">→</a><span dir="auto"><span class="autocomment">autocomment</span></span>',
|
||
"/* autocomment */",
|
||
false, true
|
||
),
|
||
array(
|
||
'<span dir="auto"><span class="autocomment">autocomment</span></span>',
|
||
"/* autocomment */",
|
||
null
|
||
),
|
||
// Linker::formatLinksInComment
|
||
array(
|
||
'abc <a href="/wiki/index.php?title=Link&action=edit&redlink=1" class="new" title="Link (page does not exist)">link</a> def',
|
||
"abc [[link]] def",
|
||
),
|
||
array(
|
||
'abc <a href="/wiki/index.php?title=Link&action=edit&redlink=1" class="new" title="Link (page does not exist)">text</a> def',
|
||
"abc [[link|text]] def",
|
||
),
|
||
array(
|
||
'abc <a href="/wiki/Special:BlankPage" title="Special:BlankPage">Special:BlankPage</a> def',
|
||
"abc [[Special:BlankPage|]] def",
|
||
),
|
||
array(
|
||
'abc <a href="/wiki/index.php?title=%C4%84%C5%9B%C5%BC&action=edit&redlink=1" class="new" title="Ąśż (page does not exist)">ąśż</a> def',
|
||
"abc [[%C4%85%C5%9B%C5%BC]] def",
|
||
),
|
||
array(
|
||
'abc <a href="/wiki/Special:BlankPage#section" title="Special:BlankPage">#section</a> def',
|
||
"abc [[#section]] def",
|
||
),
|
||
array(
|
||
'abc <a href="/wiki/index.php?title=/subpage&action=edit&redlink=1" class="new" title="/subpage (page does not exist)">/subpage</a> def',
|
||
"abc [[/subpage]] def",
|
||
),
|
||
);
|
||
}
|
||
}
|