Further 1.34 compatibility fix (#38)

* Change \ObjectCache::getMainWANInstance() to \MediaWiki\MediaWikiServices::getInstance()->getMainWANObjectCache() * Use ParserOutput::getText() options instead of ParserOptions::setEditSection() * Change ParserOptions::setEditSection() to options * Use AtEase instead of wfSuppressWarnings() and wfRestoreWarnings()
nbdd0121 · Apr 5, 2020 · ad49482 · ad49482
1 parent 6adb773
commit ad49482
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/includes/API.php b/includes/API.php
@@ -59,8 +59,6 @@ private function fetchPosts($pageid) {
 
 		$comments = $this->convertPosts($page->posts);
 
-		// This is slow, use cache
-		$cache = \ObjectCache::getMainWANInstance();
 		$popular = PopularPosts::getFromPageId($pageid);
 		$popularRet = $this->convertPosts($popular);
 
@@ -151,6 +149,7 @@ private function executeListAll() {
 		}
 
 		$query->fetch();
+		/** @var Post[] $posts */
 		$posts = $query->posts;
 
 		// We fetched one extra row. If it exists in response, then we know we have more to fetch.
@@ -354,10 +353,9 @@ public function execute() {
 
 				// Set options for parsing
 				$opt = new \ParserOptions($this->getUser());
-				$opt->setEditSection(false); // Edit button will not work!
 
 				$output = $parser->parse($text, \Title::newFromId($page), $opt);
-				$text = $output->getText();
+				$text = $output->getText(['enableSectionEditLinks' => false]); // Edit button will not work!
 
 				// Get all mentioned user
 				$mentioned = Helper::generateMentionedList($output, $postObject);

diff --git a/includes/PopularPosts.php b/includes/PopularPosts.php
@@ -1,6 +1,8 @@
 <?php
 namespace FlowThread;
 
+use MediaWiki\MediaWikiServices;
+
 class PopularPosts {
 
 	const CACHE_TTL = 3600;
@@ -11,7 +13,7 @@ public static function getFromPageId($pageid) {
 
 	public static function invalidateCache($post) {
 		$pageid = $post->pageid;
-		$cache = \ObjectCache::getMainWANInstance();
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		$key = wfMemcKey('flowthread', 'popular', $pageid);
 		$cachedValue = $cache->get($key);
 		if ($cachedValue === false) {
@@ -23,7 +25,7 @@ public static function invalidateCache($post) {
 	}
 
 	private static function fetchFromCache($pageid) {
-		$cache = \ObjectCache::getMainWANInstance();
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		$key = wfMemcKey('flowthread', 'popular', $pageid);
 		$cachedValue = $cache->get($key);
 		if ($cachedValue === false) {

diff --git a/includes/SpamFilter.php b/includes/SpamFilter.php
@@ -1,15 +1,18 @@
 <?php
 namespace FlowThread;
 
+use MediaWiki\MediaWikiServices;
+use Wikimedia\AtEase\AtEase;
+
 class SpamFilter {
 
 	/**
 	 * Validate if a regular expression is valid
 	 */
 	private static function validateRegex($regex) {
-		wfSuppressWarnings();
+		AtEase::suppressWarnings();
 		$ok = preg_match($regex, '');
-		wfRestoreWarnings();
+		AtEase::restoreWarnings();
 
 		if ($ok === false) {
 			return false;
@@ -121,7 +124,7 @@ private static function parseLines($lines) {
 	}
 
 	private static function getBlackList() {
-		$cache = \ObjectCache::getMainWANInstance();
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		return $cache->getWithSetCallback(
 			wfMemcKey('flowthread', 'spamblacklist'),
 			60,
@@ -184,4 +187,4 @@ public static function validate($text, $poster, $wikitext) {
 	public static function sanitize($html) {
 		return preg_replace('/position(?:\/\*[^*]*\*+([^\/*][^*]*\*+)*\/|\s)*:(?:\/\*[^*]*\*+([^\/*][^*]*\*+)*\/|\s)*fixed/i', '', $html);
 	}
-}
+}