From: Brad Jorsch Date: Thu, 12 Oct 2017 20:00:52 +0000 (-0400) Subject: Add deprecation notices for selectFields() methods deprecated in Idcfd1556 X-Git-Tag: 1.31.0-rc.0~1630 X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=c2f432625fdf1fe84f2be1aca782f4b3ec175804;p=lhc%2Fweb%2Fwiklou.git Add deprecation notices for selectFields() methods deprecated in Idcfd1556 Now that WMF-deployed extensions have been updated to no longer call them. Change-Id: I04942ca1b95baa2126f2dcf4d0975536f4dd07c7 Depends-On: I300130c7b952a353ac28989d39d7f01366da2a37 Depends-On: Ia81bf6a655af800ce8ac19940d851e65746e1f77 Depends-On: I0d869aacaaad85cdd34361a611ac8348bdbb757d Depends-On: I7b05a99e23da296a673eb0bd34f18344618c8be3 Depends-On: I42237e8e29497bbc56606f6ad01de3d525bf8b2a Depends-On: If75d2e76c2f166bc40a544dd502da43171ce1e7b Depends-On: I401809d2638b11e6c77a318fc8fbbc41fa639083 Depends-On: I5d62ad76fdb64a9c6efd228f27e9b5f512f17d5e Depends-On: I488afaa991e3d26b638a4f588f70db455959eadf Depends-On: Ibe82dadb0f2d1c5dbc38b96731c6e443c5469ff0 Depends-On: Id25b86dd415e2e3c6190a91faee2a3b815e50f61 --- diff --git a/includes/Revision.php b/includes/Revision.php index f9810a0354..518360c07e 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -426,6 +426,7 @@ class Revision implements IDBAccessObject { * @return array */ public static function userJoinCond() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ]; } @@ -437,6 +438,7 @@ class Revision implements IDBAccessObject { * @return array */ public static function pageJoinCond() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'INNER JOIN', [ 'page_id = rev_page' ] ]; } @@ -449,6 +451,8 @@ class Revision implements IDBAccessObject { public static function selectFields() { global $wgContentHandlerUseDB; + wfDeprecated( __METHOD__, '1.31' ); + $fields = [ 'rev_id', 'rev_page', @@ -481,6 +485,9 @@ class Revision implements IDBAccessObject { */ public static function selectArchiveFields() { global $wgContentHandlerUseDB; + + wfDeprecated( __METHOD__, '1.31' ); + $fields = [ 'ar_id', 'ar_page_id', @@ -513,6 +520,7 @@ class Revision implements IDBAccessObject { * @return array */ public static function selectTextFields() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'old_text', 'old_flags' @@ -525,6 +533,7 @@ class Revision implements IDBAccessObject { * @return array */ public static function selectPageFields() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'page_namespace', 'page_title', @@ -541,6 +550,7 @@ class Revision implements IDBAccessObject { * @return array */ public static function selectUserFields() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'user_name' ]; } diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index bb2412074c..a47186581a 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -210,6 +210,7 @@ class RecentChange { * @return array */ public static function selectFields() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'rc_id', 'rc_timestamp', diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 0b730f60af..44c90af347 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -200,6 +200,7 @@ class LocalFile extends File { * @return array */ static function selectFields() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'img_name', 'img_size', diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php index 6833a3880e..69e6896f0e 100644 --- a/includes/filerepo/file/OldLocalFile.php +++ b/includes/filerepo/file/OldLocalFile.php @@ -110,6 +110,7 @@ class OldLocalFile extends LocalFile { * @return array */ static function selectFields() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'oi_name', 'oi_archive_name', diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 946c7f062b..1047a93e7a 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -286,6 +286,8 @@ class WikiPage implements Page, IDBAccessObject { public static function selectFields() { global $wgContentHandlerUseDB, $wgPageLanguageUseDB; + wfDeprecated( __METHOD__, '1.31' ); + $fields = [ 'page_id', 'page_namespace', diff --git a/includes/user/User.php b/includes/user/User.php index d397962ded..854ebbd37d 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -5508,6 +5508,7 @@ class User implements IDBAccessObject { * @return array */ public static function selectFields() { + wfDeprecated( __METHOD__, '1.31' ); return [ 'user_id', 'user_name',