jenkins-bot has submitted this change and it was merged. Change subject: phpcs: Normalize methods declarations to "[final abstract] [visibility]". ......................................................................
phpcs: Normalize methods declarations to "[final abstract] [visibility]". CodeSniffer sniff is: [abstract final] [<visibility>] [static] function As declared by: PSR2.Methods.MethodDeclaration.StaticBeforeVisibility in: https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml Change-Id: Ifabd289e8668019ed752bdd711b3b43a9c346336 --- M includes/externalstore/ExternalStoreMedium.php M maintenance/deleteArchivedFiles.inc M maintenance/deleteArchivedRevisions.inc M maintenance/fuzz-tester.php M tests/parser/parserTest.inc M tests/selenium/Selenium.php M tests/selenium/SeleniumTestSuite.php 7 files changed, 17 insertions(+), 17 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Anomie: Looks good to me, but someone else must approve Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/externalstore/ExternalStoreMedium.php b/includes/externalstore/ExternalStoreMedium.php index 99d5fc3..34e43e2 100644 --- a/includes/externalstore/ExternalStoreMedium.php +++ b/includes/externalstore/ExternalStoreMedium.php @@ -46,7 +46,7 @@ * @return string|bool The text stored or false on error * @throws MWException */ - public abstract function fetchFromURL( $url ); + abstract public function fetchFromURL( $url ); /** * Insert a data item into a given location @@ -56,5 +56,5 @@ * @return string|bool The URL of the stored data item, or false on error * @throws MWException */ - public abstract function store( $location, $data ); + abstract public function store( $location, $data ); } diff --git a/maintenance/deleteArchivedFiles.inc b/maintenance/deleteArchivedFiles.inc index cc09703..792ee6c 100644 --- a/maintenance/deleteArchivedFiles.inc +++ b/maintenance/deleteArchivedFiles.inc @@ -27,7 +27,7 @@ * @ingroup Maintenance */ class DeleteArchivedFilesImplementation { - static public function doDelete( $output, $force ) { + public static function doDelete( $output, $force ) { # Data should come off the master, wrapped in a transaction $dbw = wfGetDB( DB_MASTER ); $dbw->begin( __METHOD__ ); diff --git a/maintenance/deleteArchivedRevisions.inc b/maintenance/deleteArchivedRevisions.inc index 414d41a..dd8e3dd 100644 --- a/maintenance/deleteArchivedRevisions.inc +++ b/maintenance/deleteArchivedRevisions.inc @@ -36,7 +36,7 @@ * purgeRedundantText(). See Maintenance for a description of * those methods. */ - static public function doDelete( $maint ) { + public static function doDelete( $maint ) { $dbw = wfGetDB( DB_MASTER ); $dbw->begin( __METHOD__ ); diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php index 445a3fb..6bb44a1 100644 --- a/maintenance/fuzz-tester.php +++ b/maintenance/fuzz-tester.php @@ -747,7 +747,7 @@ /** ** Randomly returns one element of the input array. */ - static public function chooseInput( array $input ) { + public static function chooseInput( array $input ) { $randindex = wikiFuzz::randnum( count( $input ) - 1 ); return $input[$randindex]; } @@ -761,7 +761,7 @@ * @param $start int * @return int */ - static public function randnum( $finish, $start = 0 ) { + public static function randnum( $finish, $start = 0 ) { return mt_rand( $start, $finish ); } @@ -769,7 +769,7 @@ * Returns a mix of random text and random wiki syntax. * @return string */ - static private function randstring() { + private static function randstring() { $thestring = ""; for ( $i = 0; $i < 40; $i++ ) { @@ -801,7 +801,7 @@ * or random data from "other". * @return string */ - static private function makestring() { + private static function makestring() { $what = wikiFuzz::randnum( 2 ); if ( $what == 0 ) { return wikiFuzz::randstring(); @@ -818,7 +818,7 @@ * @param $matches * @return string */ - static private function stringEscape( $matches ) { + private static function stringEscape( $matches ) { return sprintf( "\\x%02x", ord( $matches[1] ) ); } @@ -828,7 +828,7 @@ * @param $str string * @return string */ - static public function makeTitleSafe( $str ) { + public static function makeTitleSafe( $str ) { $legalTitleChars = " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF"; return preg_replace_callback( "/([^$legalTitleChars])/", 'wikiFuzz::stringEscape', @@ -839,7 +839,7 @@ ** Returns a string of fuzz text. * @return string */ - static private function loop() { + private static function loop() { switch ( wikiFuzz::randnum( 3 ) ) { case 1: // an opening tag, with parameters. $string = ""; @@ -868,7 +868,7 @@ * Returns one of the three styles of random quote: ', ", and nothing. * @return string */ - static private function getRandQuote() { + private static function getRandQuote() { switch ( wikiFuzz::randnum( 3 ) ) { case 1 : return "'"; case 2 : return "\""; @@ -881,7 +881,7 @@ * @param $maxtypes int * @return string */ - static public function makeFuzz( $maxtypes = 2 ) { + public static function makeFuzz( $maxtypes = 2 ) { $page = ""; for ( $k = 0; $k < $maxtypes; $k++ ) { $page .= wikiFuzz::loop(); diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc index 05a6f15..6b56dcf 100644 --- a/tests/parser/parserTest.inc +++ b/tests/parser/parserTest.inc @@ -227,7 +227,7 @@ * Remove last character if it is a newline * @group utility */ - static public function chomp( $s ) { + public static function chomp( $s ) { if ( substr( $s, -1 ) === "\n" ) { return substr( $s, 0, -1 ); } @@ -1195,7 +1195,7 @@ * @param $line Integer: the input line number, for reporting errors * @param $ignoreDuplicate Boolean: whether to silently ignore duplicate pages */ - static public function addArticle( $name, $text, $line = 'unknown', $ignoreDuplicate = '' ) { + public static function addArticle( $name, $text, $line = 'unknown', $ignoreDuplicate = '' ) { global $wgCapitalLinks; $oldCapitalLinks = $wgCapitalLinks; diff --git a/tests/selenium/Selenium.php b/tests/selenium/Selenium.php index ecf7f9e..0cd50fe 100644 --- a/tests/selenium/Selenium.php +++ b/tests/selenium/Selenium.php @@ -106,7 +106,7 @@ self::$url = $url; } - static public function getUrl() { + public static function getUrl() { return self::$url; } diff --git a/tests/selenium/SeleniumTestSuite.php b/tests/selenium/SeleniumTestSuite.php index 81a630f..eb5f119 100644 --- a/tests/selenium/SeleniumTestSuite.php +++ b/tests/selenium/SeleniumTestSuite.php @@ -11,7 +11,7 @@ const RESULT_OK = 2; const RESULT_ERROR = 3; - public abstract function addTests(); + abstract public function addTests(); public function setUp() { // Hack because because PHPUnit version 3.0.6 which is on prototype does not -- To view, visit https://gerrit.wikimedia.org/r/48744 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifabd289e8668019ed752bdd711b3b43a9c346336 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Aaron Schulz <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: Anomie <[email protected]> Gerrit-Reviewer: Demon <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: IAlex <[email protected]> Gerrit-Reviewer: Jeroen De Dauw <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Platonides <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
