From: James D. Forrester Date: Fri, 8 Feb 2019 01:03:39 +0000 (-0800) Subject: Remove old Title CSS/JS methods, deprecated in 1.31, unused X-Git-Tag: 1.34.0-rc.0~2891^2 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=69eb43708dfbaa387b6cde73e8a7ffee1b97cfa3;p=lhc%2Fweb%2Fwiklou.git Remove old Title CSS/JS methods, deprecated in 1.31, unused Change-Id: I500b5efbdc2ee3b4ca09662ed0df89e9d7514bbd --- diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index 16d4d1e8e8..c047ebc135 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -197,6 +197,13 @@ because of Phabricator reports. Sanitizer::escapeIdForLink() or escapeIdForExternalInterwiki() instead. * Title->canTalk(), deprecated in 1.30, was removed. Instead, use Title->canHaveTalkPage(). +* Title's methods for site and user page related to CSS and JS, deprecated in + 1.31, were removed: + * Title->isCssOrJsPage() — Use Title->isSiteConfigPage() + * Title->isCssJsSubpage() – Use Title->isUserConfigPage() + * Title->getSkinFromCssJsSubpage() – Use Title->getSkinFromConfigSubpage() + * Title->isCssSubpage() – Use Title->isUserCssConfigPage() + * Title->isJsSubpage() – Use Title->isUserJsConfigPage() === Deprecations in 1.33 === * The configuration option $wgUseESI has been deprecated, and is expected diff --git a/includes/Title.php b/includes/Title.php index b24f120f85..849707e38b 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1280,17 +1280,6 @@ class Title implements LinkTarget, IDBAccessObject { ); } - /** - * @return bool - * @deprecated Since 1.31; use ::isSiteConfigPage() instead (which also checks for JSON pages) - */ - public function isCssOrJsPage() { - wfDeprecated( __METHOD__, '1.31' ); - return ( NS_MEDIAWIKI == $this->mNamespace - && ( $this->hasContentModel( CONTENT_MODEL_CSS ) - || $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) ); - } - /** * Is this a "config" (.css, .json, or .js) sub-page of a user page? * @@ -1305,17 +1294,6 @@ class Title implements LinkTarget, IDBAccessObject { ); } - /** - * @return bool - * @deprecated Since 1.31; use ::isUserConfigPage() instead (which also checks for JSON pages) - */ - public function isCssJsSubpage() { - wfDeprecated( __METHOD__, '1.31' ); - return ( NS_USER == $this->mNamespace && $this->isSubpage() - && ( $this->hasContentModel( CONTENT_MODEL_CSS ) - || $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) ); - } - /** * Trim down a .css, .json, or .js subpage title to get the corresponding skin name * @@ -1332,15 +1310,6 @@ class Title implements LinkTarget, IDBAccessObject { return substr( $subpage, 0, $lastdot ); } - /** - * @deprecated Since 1.31; use ::getSkinFromConfigSubpage() instead - * @return string Containing skin name from .css, .json, or .js subpage title - */ - public function getSkinFromCssJsSubpage() { - wfDeprecated( __METHOD__, '1.31' ); - return $this->getSkinFromConfigSubpage(); - } - /** * Is this a CSS "config" sub-page of a user page? * @@ -1355,15 +1324,6 @@ class Title implements LinkTarget, IDBAccessObject { ); } - /** - * @deprecated Since 1.31; use ::isUserCssConfigPage() - * @return bool - */ - public function isCssSubpage() { - wfDeprecated( __METHOD__, '1.31' ); - return $this->isUserCssConfigPage(); - } - /** * Is this a JSON "config" sub-page of a user page? * @@ -1392,15 +1352,6 @@ class Title implements LinkTarget, IDBAccessObject { ); } - /** - * @deprecated Since 1.31; use ::isUserJsConfigPage() - * @return bool - */ - public function isJsSubpage() { - wfDeprecated( __METHOD__, '1.31' ); - return $this->isUserJsConfigPage(); - } - /** * Is this a sitewide CSS "config" page? *