Merge pull request #41 from Universal-Omega/patch-2

Fix three fatal errors with MediaWiki 1.36.0+
lkucharczyk · Jun 4, 2021 · eb05dd2 · eb05dd2
2 parents c1f6ff4 + 0136eb0
commit eb05dd2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # mediawiki-PortableInfobox
-Port of FANDOM's https://github.com/Wikia/app/tree/dev/extensions/wikia/PortableInfobox extension to the MediaWiki 1.27+
+Port of FANDOM's https://github.com/Wikia/app/tree/dev/extensions/wikia/PortableInfobox extension to the MediaWiki 1.32+
 
 ## Installation
 Grab the latest release from [GitHub](https://github.com/Luqgreg/mediawiki-PortableInfobox/releases/latest) and unpack it into `extensions\PortableInfobox` directory in your MediaWiki installation or clone this repository, by using these commands:

diff --git a/extension.json b/extension.json
@@ -10,7 +10,7 @@
 	"type": "parserhook",
 	"license-name": "GPL-3.0-or-later",
 	"requires": {
-		"MediaWiki": ">= 1.27.0"
+		"MediaWiki": ">= 1.32.0"
 	},
 	"config": {
 		"AllInfoboxesSubpagesBlacklist": [ "doc", "draft", "test" ],
@@ -104,4 +104,4 @@
 		"allinfoboxes": "ApiQueryAllinfoboxes"
 	},
 	"manifest_version": 1
-}
+}
diff --git a/includes/services/Helpers/PortableInfoboxParsingHelper.php b/includes/services/Helpers/PortableInfoboxParsingHelper.php
@@ -3,6 +3,7 @@
 namespace PortableInfobox\Helpers;
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 
 class PortableInfoboxParsingHelper {
 
@@ -26,7 +27,7 @@ public function parseIncludeonlyInfoboxes( $title ) {
 		$templateText = $this->fetchArticleContent( $title );
 
 		if ( $templateText ) {
-			$parser = new \Parser();
+			$parser = MediaWikiServices::getInstance()->getParser();
 			$parser->setTitle( $title );
 			$parserOptions = new \ParserOptions();
 			$frame = $parser->getPreprocessor()->newFrame();

diff --git a/includes/services/Parser/MediaWikiParserService.php b/includes/services/Parser/MediaWikiParserService.php
@@ -1,6 +1,9 @@
 <?php
+
 namespace PortableInfobox\Parser;
 
+use MediaWiki\MediaWikiServices;
+
 class MediaWikiParserService implements ExternalParser {
 
 	protected $parser;
@@ -16,10 +19,14 @@ public function __construct( \Parser $parser, \PPFrame $frame ) {
 		$this->frame = $frame;
 
 		if ( $wgPortableInfoboxUseTidy && class_exists( '\MediaWiki\Tidy\RemexDriver' ) ) {
-			$this->tidyDriver = \MWTidy::factory( [
-				'driver' => 'RemexHtml',
-				'pwrap' => false
-			] );
+			if ( version_compare( MW_VERSION, '1.36', '>=' ) ) {
+				$this->tidyDriver = MediaWikiServices::getInstance()->getTidy();
+			} else {
+				$this->tidyDriver = \MWTidy::factory( [
+					'driver' => 'RemexHtml',
+					'pwrap' => false
+				] );
+			}
 		}
 	}
 

diff --git a/includes/services/Parser/Nodes/NodeMedia.php b/includes/services/Parser/Nodes/NodeMedia.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace PortableInfobox\Parser\Nodes;
 
+use MediaWiki\MediaWikiServices;
 use PortableInfobox\Helpers\FileNamespaceSanitizeHelper;
 use PortableInfobox\Helpers\PortableInfoboxDataBag;
 use PortableInfobox\Helpers\PortableInfoboxImagesHelper;
@@ -195,10 +197,11 @@ public function getSources() {
 	}
 
 	private function getImageAsTitleObject( $imageName ) {
-		global $wgContLang;
+		$contLang = MediaWikiServices::getInstance()->getContentLanguage();
+
 		$title = \Title::makeTitleSafe(
 			NS_FILE,
-			FileNamespaceSanitizeHelper::getInstance()->sanitizeImageFileName( $imageName, $wgContLang )
+			FileNamespaceSanitizeHelper::getInstance()->sanitizeImageFileName( $imageName, $contLang )
 		);
 
 		return $title;