From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 28 Sep 2019 20:00:24 +0000 (+0000)
Subject: Merge "resourceloader: Remove support for $context === null in getContentObj"
X-Git-Tag: 1.34.0-rc.0~57
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=6f54a1695b8e7ecf940ba60a800abce17e81122a;hp=efbfa0a727a196e63a2b71f0a82f09150c2be354;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Remove support for $context === null in getContentObj"
---

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 37501d4f7a..237cea46c3 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -165,11 +165,11 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 
 	/**
 	 * @param string $titleText
-	 * @param ResourceLoaderContext|null $context (but passing null is deprecated)
+	 * @param ResourceLoaderContext $context
 	 * @return null|string
 	 * @since 1.32 added the $context parameter
 	 */
-	protected function getContent( $titleText, ResourceLoaderContext $context = null ) {
+	protected function getContent( $titleText, ResourceLoaderContext $context ) {
 		$title = Title::newFromText( $titleText );
 		if ( !$title ) {
 			return null; // Bad title
@@ -194,20 +194,16 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 
 	/**
 	 * @param Title $title
-	 * @param ResourceLoaderContext|null $context (but passing null is deprecated)
+	 * @param ResourceLoaderContext $context
 	 * @param int|null $maxRedirects Maximum number of redirects to follow. If
 	 *  null, uses $wgMaxRedirects
 	 * @return Content|null
 	 * @since 1.32 added the $context and $maxRedirects parameters
 	 */
 	protected function getContentObj(
-		Title $title, ResourceLoaderContext $context = null, $maxRedirects = null
+		Title $title, ResourceLoaderContext $context, $maxRedirects = null
 	) {
-		if ( $context === null ) {
-			wfDeprecated( __METHOD__ . ' without a ResourceLoader context', '1.32' );
-		}
-
-		$overrideCallback = $context ? $context->getContentOverrideCallback() : null;
+		$overrideCallback = $context->getContentOverrideCallback();
 		$content = $overrideCallback ? call_user_func( $overrideCallback, $title ) : null;
 		if ( $content ) {
 			if ( !$content instanceof Content ) {