wikimedia/mediawiki-extensions-SecureLinkFixer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/SecureLinkFixer synced 2024-11-11 17:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Avoid use of deprecated URL related global functions"

Browse source
This commit is contained in:
jenkins-bot 2024-09-09 19:52:01 +00:00 committed by Gerrit Code Review
parent 25ab55da77 ef6ff77539
commit c989487db5
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extension.json
View file

@ -20,7 +20,8 @@
"main": {
"class": "MediaWiki\\SecureLinkFixer\\Hooks",
"services": [
"HSTSPreloadLookup"
"HSTSPreloadLookup",
"UrlUtils"
]
}
},

9
includes/Hooks.php
View file

@ -19,13 +19,16 @@
namespace MediaWiki\SecureLinkFixer;
use MediaWiki\Hook\LinkerMakeExternalLinkHook;
use MediaWiki\Utils\UrlUtils;
class Hooks implements LinkerMakeExternalLinkHook {
private HSTSPreloadLookup $lookup;
private UrlUtils $urlUtils;
public function __construct( HSTSPreloadLookup $lookup ) {
public function __construct( HSTSPreloadLookup $lookup, UrlUtils $urlUtils ) {
$this->lookup = $lookup;
$this->urlUtils = $urlUtils;
}
/**
@ -48,7 +51,7 @@ class Hooks implements LinkerMakeExternalLinkHook {
return;
}
$parsed = wfParseUrl( $url );
$parsed = $this->urlUtils->parse( $url );
if ( !$parsed ) {
return;
}
@ -61,7 +64,7 @@ class Hooks implements LinkerMakeExternalLinkHook {
if ( $this->lookup->isPreloaded( $parsed['host'] ) ) {
$parsed['scheme'] = 'https';
$parsed['delimiter'] = '://';
$url = wfAssembleUrl( $parsed );
$url = UrlUtils::assemble( $parsed );
}
}
}

3
tests/phpunit/HooksTest.php
View file

@ -30,7 +30,8 @@ class HooksTest extends MediaWikiIntegrationTestCase {
* @dataProvider provideOnLinkerMakeExternalLink
*/
public function testOnLinkerMakeExternalLink( $input, $expected ) {
$hooks = new Hooks( $this->getServiceContainer()->getService( 'HSTSPreloadLookup' ) );
$services = $this->getServiceContainer();
$hooks = new Hooks( $services->getService( 'HSTSPreloadLookup' ), $services->getUrlUtils() );
$dummy = '';
$dummy2 = [];
$hooks->onLinkerMakeExternalLink( $input, $dummy, $dummy, $dummy2, $dummy );