From ef6ff7753920d852081f629258bd5f00122025e9 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Mon, 9 Sep 2024 09:23:31 +0330
Subject: [PATCH] Avoid use of deprecated URL related global functions

Change-Id: I752d77c6c23f0cf8598d3759c73df29cd385652d
---
 extension.json              | 3 ++-
 includes/Hooks.php          | 9 ++++++---
 tests/phpunit/HooksTest.php | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/extension.json b/extension.json
index 7cb41a1..f24028d 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,8 @@
 		"main": {
 			"class": "MediaWiki\\SecureLinkFixer\\Hooks",
 			"services": [
-				"HSTSPreloadLookup"
+				"HSTSPreloadLookup",
+				"UrlUtils"
 			]
 		}
 	},
diff --git a/includes/Hooks.php b/includes/Hooks.php
index b266183..360465c 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -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 );
 		}
 	}
 }
diff --git a/tests/phpunit/HooksTest.php b/tests/phpunit/HooksTest.php
index 0184953..06b8509 100644
--- a/tests/phpunit/HooksTest.php
+++ b/tests/phpunit/HooksTest.php
@@ -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 );