From 89b8ac1145cc6c981f1bd7c2c616e486255d7825 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sat, 26 Jan 2013 20:49:50 +0100 Subject: [PATCH] The final declaration must precede the visibility declaration From phpcs Change-Id: I87592615014f39eff2a299cf578e8889afd902f7 --- includes/Action.php | 26 +++++++++++++------------- includes/ExternalUser.php | 4 ++-- includes/SpecialPage.php | 2 +- includes/db/Database.php | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/includes/Action.php b/includes/Action.php index c7ef4f6e49..c54640fe25 100644 --- a/includes/Action.php +++ b/includes/Action.php @@ -61,7 +61,7 @@ abstract class Action { * @param $overrides Array * @return bool|null|string */ - private final static function getClass( $action, array $overrides ) { + final private static function getClass( $action, array $overrides ) { global $wgActions; $action = strtolower( $action ); @@ -88,7 +88,7 @@ abstract class Action { * @return Action|bool|null false if the action is disabled, null * if it is not recognised */ - public final static function factory( $action, Page $page, IContextSource $context = null ) { + final public static function factory( $action, Page $page, IContextSource $context = null ) { $class = self::getClass( $action, $page->getActionOverrides() ); if ( $class ) { $obj = new $class( $page, $context ); @@ -106,7 +106,7 @@ abstract class Action { * @param $context IContextSource * @return string: action name */ - public final static function getActionName( IContextSource $context ) { + final public static function getActionName( IContextSource $context ) { global $wgActions; $request = $context->getRequest(); @@ -150,7 +150,7 @@ abstract class Action { * @param $name String: name of an action * @return Bool */ - public final static function exists( $name ) { + final public static function exists( $name ) { return self::getClass( $name, array() ) !== null; } @@ -158,7 +158,7 @@ abstract class Action { * Get the IContextSource in use here * @return IContextSource */ - public final function getContext() { + final public function getContext() { if ( $this->context instanceof IContextSource ) { return $this->context; } @@ -170,7 +170,7 @@ abstract class Action { * * @return WebRequest */ - public final function getRequest() { + final public function getRequest() { return $this->getContext()->getRequest(); } @@ -179,7 +179,7 @@ abstract class Action { * * @return OutputPage */ - public final function getOutput() { + final public function getOutput() { return $this->getContext()->getOutput(); } @@ -188,7 +188,7 @@ abstract class Action { * * @return User */ - public final function getUser() { + final public function getUser() { return $this->getContext()->getUser(); } @@ -197,7 +197,7 @@ abstract class Action { * * @return Skin */ - public final function getSkin() { + final public function getSkin() { return $this->getContext()->getSkin(); } @@ -206,7 +206,7 @@ abstract class Action { * * @return Language */ - public final function getLanguage() { + final public function getLanguage() { return $this->getContext()->getLanguage(); } @@ -216,7 +216,7 @@ abstract class Action { * @deprecated 1.19 Use getLanguage instead * @return Language */ - public final function getLang() { + final public function getLang() { wfDeprecated( __METHOD__, '1.19' ); return $this->getLanguage(); } @@ -225,7 +225,7 @@ abstract class Action { * Shortcut to get the Title object from the page * @return Title */ - public final function getTitle() { + final public function getTitle() { return $this->page->getTitle(); } @@ -235,7 +235,7 @@ abstract class Action { * * @return Message object */ - public final function msg() { + final public function msg() { $params = func_get_args(); return call_user_func_array( array( $this->getContext(), 'msg' ), $params ); } diff --git a/includes/ExternalUser.php b/includes/ExternalUser.php index 13930a6e1e..46565e4e37 100644 --- a/includes/ExternalUser.php +++ b/includes/ExternalUser.php @@ -280,7 +280,7 @@ abstract class ExternalUser { * * @param $id int user_id */ - public final function linkToLocal( $id ) { + final public function linkToLocal( $id ) { $dbw = wfGetDB( DB_MASTER ); $dbw->replace( 'external_user', array( 'eu_local_id', 'eu_external_id' ), @@ -294,7 +294,7 @@ abstract class ExternalUser { * a local user. * @return Mixed User if the account is linked, Null otherwise. */ - public final function getLocalUser(){ + final public function getLocalUser(){ $dbr = wfGetDB( DB_SLAVE ); $row = $dbr->selectRow( 'external_user', diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php index 374fbd1a96..ca940437f3 100644 --- a/includes/SpecialPage.php +++ b/includes/SpecialPage.php @@ -598,7 +598,7 @@ class SpecialPage { * * @param $subPage string|null */ - public final function run( $subPage ) { + final public function run( $subPage ) { /** * Gets called before @see SpecialPage::execute. * diff --git a/includes/db/Database.php b/includes/db/Database.php index 3fe68221bf..fff1837c91 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -724,7 +724,7 @@ abstract class DatabaseBase implements DatabaseType { * Valid options are: host, user, password, dbname, flags, tablePrefix * @return DatabaseBase subclass or null */ - public final static function factory( $dbType, $p = array() ) { + final public static function factory( $dbType, $p = array() ) { $canonicalDBTypes = array( 'mysql', 'postgres', 'sqlite', 'oracle', 'mssql', 'ibm_db2' ); -- 2.20.1