From: Siebrand Mazeland Date: Sun, 29 Dec 2013 18:26:50 +0000 (+0100) Subject: Remove methods from SpecialPage deprecated in 1.17 and 1.18 X-Git-Tag: 1.31.0-rc.0~17376^2 X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=a8ceae23ef0f5848aa6b436bcb3e6e894d05a6c3;p=lhc%2Fweb%2Fwiklou.git Remove methods from SpecialPage deprecated in 1.17 and 1.18 No longer used in core or Gerrit extensions. Some patches have been submitted to remove the last usages. For details see: * https://gerrit.wikimedia.org/r/#/q/status:open+topic:replace-deprecated,n,z * https://gerrit.wikimedia.org/r/#/q/status:merged+topic:replace-deprecated,n,z - SpecialPage::__call() (deprecated in 1.17) - SpecialPage::executePath() (deprecated in 1.18) - SpecialPage::exists() (deprecated in 1.18) - SpecialPage::file() (deprecated in 1.18) - SpecialPage::func() (deprecated in 1.18) - SpecialPage::getGroup() (deprecated in 1.18) - SpecialPage::getPage() (deprecated in 1.18) - SpecialPage::getPageByAlias() (deprecated in 1.18) - SpecialPage::getLocalNameFor() (deprecated in 1.18) - SpecialPage::getRegularPages() (deprecated in 1.18) - SpecialPage::getRestrictedPages() (deprecated in 1.18) - SpecialPage::getTitleForAlias() (deprecated in 1.18) - SpecialPage::getUsablePages() (deprecated in 1.18) - SpecialPage::includable() (deprecated in 1.18) - SpecialPage::init() - SpecialPage::initAliasList() (deprecated in 1.18) - SpecialPage::initList() (deprecated in 1.18) - SpecialPage::name() (deprecated in 1.18) - SpecialPage::removePage() (deprecated in 1.18) - SpecialPage::resolveAlias() (deprecated in 1.18) - SpecialPage::resolveAliasWithSubpage() (deprecated in 1.18) - SpecialPage::restriction() (deprecated in 1.18) - SpecialPage::setGroup() (deprecated in 1.18) Change-Id: I5122f0f23255bc1e8b63a7329a6d1653899b7f59 --- diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index d682206e83..2a0f673c96 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -188,6 +188,29 @@ changes to languages because of Bugzilla reports. * ProfilerSimple::getCpuTime (deprecated in 1.20) * Revision::revText() (deprecated in 1.17) * SkinTemplate::jstext() (deprecated in 1.21) +* SpecialPage::__call() (deprecated in 1.17) +* SpecialPage::executePath() (deprecated in 1.18) +* SpecialPage::exists() (deprecated in 1.18) +* SpecialPage::file() (deprecated in 1.18) +* SpecialPage::func() (deprecated in 1.18) +* SpecialPage::getGroup() (deprecated in 1.18) +* SpecialPage::getPage() (deprecated in 1.18) +* SpecialPage::getPageByAlias() (deprecated in 1.18) +* SpecialPage::getLocalNameFor() (deprecated in 1.18) +* SpecialPage::getRegularPages() (deprecated in 1.18) +* SpecialPage::getRestrictedPages() (deprecated in 1.18) +* SpecialPage::getTitleForAlias() (deprecated in 1.18) +* SpecialPage::getUsablePages() (deprecated in 1.18) +* SpecialPage::includable() (deprecated in 1.18) +* SpecialPage::init() +* SpecialPage::initAliasList() (deprecated in 1.18) +* SpecialPage::initList() (deprecated in 1.18) +* SpecialPage::name() (deprecated in 1.18) +* SpecialPage::removePage() (deprecated in 1.18) +* SpecialPage::resolveAlias() (deprecated in 1.18) +* SpecialPage::resolveAliasWithSubpage() (deprecated in 1.18) +* SpecialPage::restriction() (deprecated in 1.18) +* SpecialPage::setGroup() (deprecated in 1.18) * SpecialRecentChanges::feedSetup() * SpecialRevisionDelete::extractBitField() (deprecated in 1.22) * User::getPageRenderingHash() (deprecated in 1.17) diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php index 1df52f2f4a..e5ce48f0b4 100644 --- a/includes/specialpage/SpecialPage.php +++ b/includes/specialpage/SpecialPage.php @@ -63,195 +63,6 @@ class SpecialPage { */ protected $mContext; - /** - * Initialise the special page list - * This must be called before accessing SpecialPage::$mList - * @deprecated since 1.18 - */ - static function initList() { - wfDeprecated( __METHOD__, '1.18' ); - // Noop - } - - /** - * @deprecated since 1.18 - */ - static function initAliasList() { - wfDeprecated( __METHOD__, '1.18' ); - // Noop - } - - /** - * Given a special page alias, return the special page name. - * Returns false if there is no such alias. - * - * @param $alias String - * @return String or false - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function resolveAlias( $alias ) { - wfDeprecated( __METHOD__, '1.18' ); - list( $name, /*...*/ ) = SpecialPageFactory::resolveAlias( $alias ); - return $name; - } - - /** - * Given a special page name with a possible subpage, return an array - * where the first element is the special page name and the second is the - * subpage. - * - * @param $alias String - * @return Array - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function resolveAliasWithSubpage( $alias ) { - return SpecialPageFactory::resolveAlias( $alias ); - } - - /** - * Add a page to a certain display group for Special:SpecialPages - * - * @param $page Mixed: SpecialPage or string - * @param $group String - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function setGroup( $page, $group ) { - wfDeprecated( __METHOD__, '1.18' ); - SpecialPageFactory::setGroup( $page, $group ); - } - - /** - * Get the group that the special page belongs in on Special:SpecialPage - * - * @param $page SpecialPage - * @return string - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getGroup( &$page ) { - wfDeprecated( __METHOD__, '1.18' ); - return $page->getFinalGroupName(); - } - - /** - * Remove a special page from the list - * Formerly used to disable expensive or dangerous special pages. The - * preferred method is now to add a SpecialPage_initList hook. - * @deprecated since 1.18 - * - * @param string $name the page to remove - */ - static function removePage( $name ) { - wfDeprecated( __METHOD__, '1.18' ); - unset( SpecialPageFactory::getList()->$name ); - } - - /** - * Check if a given name exist as a special page or as a special page alias - * - * @param string $name name of a special page - * @return Boolean: true if a special page exists with this name - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function exists( $name ) { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::exists( $name ); - } - - /** - * Find the object with a given name and return it (or NULL) - * - * @param $name String - * @return SpecialPage object or null if the page doesn't exist - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getPage( $name ) { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::getPage( $name ); - } - - /** - * Get a special page with a given localised name, or NULL if there - * is no such special page. - * - * @param $alias String - * @return SpecialPage object or null if the page doesn't exist - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getPageByAlias( $alias ) { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::getPage( $alias ); - } - - /** - * Return categorised listable special pages which are available - * for the current user, and everyone. - * - * @param $user User object to check permissions, $wgUser will be used - * if not provided - * @return array Associative array mapping page's name to its SpecialPage object - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getUsablePages( User $user = null ) { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::getUsablePages( $user ); - } - - /** - * Return categorised listable special pages for all users - * - * @return array Associative array mapping page's name to its SpecialPage object - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getRegularPages() { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::getRegularPages(); - } - - /** - * Return categorised listable special pages which are available - * for the current user, but not for everyone - * - * @return array Associative array mapping page's name to its SpecialPage object - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getRestrictedPages() { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::getRestrictedPages(); - } - - /** - * Execute a special page path. - * The path may contain parameters, e.g. Special:Name/Params - * Extracts the special page name and call the execute method, passing the parameters - * - * Returns a title object if the page is redirected, false if there was no such special - * page, and true if it was successful. - * - * @param $title Title object - * @param $context IContextSource - * @param $including Bool output is being captured for use in {{special:whatever}} - * @return Bool - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - public static function executePath( &$title, IContextSource &$context, $including = false ) { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::executePath( $title, $context, $including ); - } - - /** - * Get the local name for a specified canonical name - * - * @param $name String - * @param $subpage Mixed: boolean false, or string - * - * @return String - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getLocalNameFor( $name, $subpage = false ) { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::getLocalNameFor( $name, $subpage ); - } - /** * Get a localised Title object for a specified special page name * @@ -282,18 +93,6 @@ class SpecialPage { } } - /** - * Get a title for a given alias - * - * @param $alias String - * @return Title or null if there is no such alias - * @deprecated since 1.18 call SpecialPageFactory method directly - */ - static function getTitleForAlias( $alias ) { - wfDeprecated( __METHOD__, '1.18' ); - return SpecialPageFactory::getTitleForAlias( $alias ); - } - /** * Default constructor for special pages * Derivative classes should call this from their constructor @@ -317,22 +116,6 @@ class SpecialPage { $name = '', $restriction = '', $listed = true, $function = false, $file = 'default', $includable = false ) { - $this->init( $name, $restriction, $listed, $function, $file, $includable ); - } - - /** - * Do the real work for the constructor, mainly so __call() can intercept - * calls to SpecialPage() - * @param string $name Name of the special page, as seen in links and URLs - * @param string $restriction User right required, e.g. "block" or "delete" - * @param bool $listed Whether the page is listed in Special:Specialpages - * @param callable|bool $function Function called by execute(). By default - * it is constructed from $name - * @param string $file File which is included by execute(). It is also - * constructed from $name by default - * @param bool $includable Whether the page can be included in normal pages - */ - private function init( $name, $restriction, $listed, $function, $file, $includable ) { $this->mName = $name; $this->mRestriction = $restriction; $this->mListed = $listed; @@ -349,34 +132,6 @@ class SpecialPage { } } - /** - * Use PHP's magic __call handler to get calls to the old PHP4 constructor - * because PHP E_STRICT yells at you for having __construct() and SpecialPage() - * - * @param string $fName Name of called method - * @param array $a Arguments to the method - * @throws MWException - * @deprecated since 1.17, call parent::__construct() - */ - public function __call( $fName, $a ) { - // Deprecated messages now, remove in 1.19 or 1.20? - wfDeprecated( __METHOD__, '1.17' ); - - // Sometimes $fName is SpecialPage, sometimes it's specialpage. <3 PHP - if ( strtolower( $fName ) == 'specialpage' ) { - $name = isset( $a[0] ) ? $a[0] : ''; - $restriction = isset( $a[1] ) ? $a[1] : ''; - $listed = isset( $a[2] ) ? $a[2] : true; - $function = isset( $a[3] ) ? $a[3] : false; - $file = isset( $a[4] ) ? $a[4] : 'default'; - $includable = isset( $a[5] ) ? $a[5] : false; - $this->init( $name, $restriction, $listed, $function, $file, $includable ); - } else { - $className = get_class( $this ); - throw new MWException( "Call to undefined method $className::$fName" ); - } - } - /** * Get the name of this Special Page. * @return string @@ -441,66 +196,6 @@ class SpecialPage { return $this->mIncludable; } - /** - * These mutators are very evil, as the relevant variables should not mutate. So - * don't use them. - * @param $x Mixed - * @return Mixed - * @deprecated since 1.18 - */ - function name( $x = null ) { - wfDeprecated( __METHOD__, '1.18' ); - return wfSetVar( $this->mName, $x ); - } - - /** - * These mutators are very evil, as the relevant variables should not mutate. So - * don't use them. - * @param $x Mixed - * @return Mixed - * @deprecated since 1.18 - */ - function restriction( $x = null ) { - wfDeprecated( __METHOD__, '1.18' ); - return wfSetVar( $this->mRestriction, $x ); - } - - /** - * These mutators are very evil, as the relevant variables should not mutate. So - * don't use them. - * @param $x Mixed - * @return Mixed - * @deprecated since 1.18 - */ - function func( $x = null ) { - wfDeprecated( __METHOD__, '1.18' ); - return wfSetVar( $this->mFunction, $x ); - } - - /** - * These mutators are very evil, as the relevant variables should not mutate. So - * don't use them. - * @param $x Mixed - * @return Mixed - * @deprecated since 1.18 - */ - function file( $x = null ) { - wfDeprecated( __METHOD__, '1.18' ); - return wfSetVar( $this->mFile, $x ); - } - - /** - * These mutators are very evil, as the relevant variables should not mutate. So - * don't use them. - * @param $x Mixed - * @return Mixed - * @deprecated since 1.18 - */ - function includable( $x = null ) { - wfDeprecated( __METHOD__, '1.18' ); - return wfSetVar( $this->mIncludable, $x ); - } - /** * Whether the special page is being evaluated via transclusion * @param bool $x