diff options
39 files changed, 130 insertions, 130 deletions
diff --git a/includes/Block.php b/includes/Block.php index 95a8386937b7..74ece4c13d9a 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -312,7 +312,7 @@ class Block { /** * Get the component of an IP address which is certain to be the same between an IP * address and a rangeblock containing that IP address. - * @param $hex String Hexadecimal IP representation + * @param $hex String Hexadecimal IP representation * @return String */ protected static function getIpFragment( $hex ) { @@ -362,7 +362,7 @@ class Block { /** * Create a new Block object from a database row - * @param $row ResultWrapper row from the ipblocks table + * @param $row ResultWrapper row from the ipblocks table * @return Block */ public static function newFromRow( $row ) { @@ -862,7 +862,7 @@ class Block { /** * Get/set whether the Block is a hardblock (affects logged-in users on a given IP/range * @param $x Bool - * @return Bool + * @return Bool */ public function isHardblock( $x = null ) { wfSetVar( $this->isHardblock, $x ); diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 274d4a75f312..1fd437ed1d30 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -205,7 +205,7 @@ class MWHttpRequest { protected $followRedirects = false; /** - * @var CookieJar + * @var CookieJar */ protected $cookieJar; diff --git a/includes/Linker.php b/includes/Linker.php index 033926ac2ed3..094a304b23bd 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -742,7 +742,7 @@ class Linker { /** * @param $title Title - * @param $file File + * @param $file File * @param array $frameParams * @param array $handlerParams * @param bool $time @@ -1467,8 +1467,8 @@ class Linker { /** * @param $contextTitle Title - * @param $target - * @param $text + * @param $target + * @param $text * @return string */ public static function normalizeSubpageLink( $contextTitle, $target, &$text ) { diff --git a/includes/MagicWord.php b/includes/MagicWord.php index 377d40649435..e301ceadc967 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -512,7 +512,7 @@ class MagicWord { } /** - * @param $text + * @param $text * @return bool */ function matchStartAndRemove( &$text ) { diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 3a6787f72670..f469732de8a3 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1315,8 +1315,8 @@ class OutputPage extends ContextSource { /** * Set the highest level of CSS/JS untrustworthiness allowed - * @param $type String ResourceLoaderModule TYPE_ constant - * @param $level Int ResourceLoaderModule class constant + * @param $type String ResourceLoaderModule TYPE_ constant + * @param $level Int ResourceLoaderModule class constant */ public function setAllowedModules( $type, $level ) { $this->mAllowedModules[$type] = $level; @@ -1324,8 +1324,8 @@ class OutputPage extends ContextSource { /** * As for setAllowedModules(), but don't inadvertently make the page more accessible - * @param $type String - * @param $level Int ResourceLoaderModule class constant + * @param $type String + * @param $level Int ResourceLoaderModule class constant */ public function reduceAllowedModules( $type, $level ) { $this->mAllowedModules[$type] = min( $this->getAllowedModules( $type ), $level ); diff --git a/includes/Skin.php b/includes/Skin.php index 38c3623ad929..9ec7c3102292 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1573,14 +1573,14 @@ abstract class Skin extends ContextSource { * Create a section edit link. This supersedes editSectionLink() and * editSectionLinkForOther(). * - * @param $nt Title The title being linked to (may not be the same as + * @param $nt Title The title being linked to (may not be the same as * the current page, if the section is included from a template) * @param string $section The designation of the section being pointed to, * to be included in the link, like "§ion=$section" * @param string $tooltip The tooltip to use for the link: will be escaped * and wrapped in the 'editsectionhint' message - * @param $lang string Language code - * @return string HTML to use for edit link + * @param $lang string Language code + * @return string HTML to use for edit link */ public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) { // HTML generated here should probably have userlangattributes diff --git a/includes/UserArrayFromResult.php b/includes/UserArrayFromResult.php index 5d5859d674ca..00366e450ee7 100644 --- a/includes/UserArrayFromResult.php +++ b/includes/UserArrayFromResult.php @@ -38,7 +38,7 @@ class UserArrayFromResult extends UserArray implements Countable { } /** - * @param $row + * @param $row * @return void */ protected function setCurrent( $row ) { diff --git a/includes/Xml.php b/includes/Xml.php index 45441fd623b3..3b82c64551f9 100644 --- a/includes/Xml.php +++ b/includes/Xml.php @@ -901,7 +901,7 @@ class XmlSelect { * label => value * label => ( label => value, label => value ) * - * @param $options + * @param $options */ public function addOptions( $options ) { $this->options[] = $options; @@ -912,7 +912,7 @@ class XmlSelect { * label => value * label => ( label => value, label => value ) * - * @param $options + * @param $options * @param bool $default * @return string */ diff --git a/includes/actions/FormAction.php b/includes/actions/FormAction.php index 974ee94f5260..73bf187c4deb 100644 --- a/includes/actions/FormAction.php +++ b/includes/actions/FormAction.php @@ -91,7 +91,7 @@ abstract class FormAction extends Action { * Process the form on POST submission. If you return false from getFormFields(), * this will obviously never be reached. If you don't want to do anything with the * form, just return false here - * @param $data Array + * @param $data Array * @return Bool|Array true for success, false for didn't-try, array of errors on failure */ abstract public function onSubmit( $data ); diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 72b1f888bfd4..fc1bfd117738 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -896,7 +896,7 @@ abstract class ApiBase extends ContextSource { /** * Callback function used in requireOnlyOneParameter to check whether required parameters are set * - * @param $x object Parameter to check is not null/false + * @param $x object Parameter to check is not null/false * @return bool */ private function parameterNotEmpty( $x ) { @@ -1322,8 +1322,8 @@ abstract class ApiBase extends ContextSource { /** * Adds a warning to the output, else dies * - * @param $msg String Message to show as a warning, or error message if dying - * @param $enforceLimits Boolean Whether this is an enforce (die) + * @param $msg String Message to show as a warning, or error message if dying + * @param $enforceLimits Boolean Whether this is an enforce (die) */ private function warnOrDie( $msg, $enforceLimits = false ) { if ( $enforceLimits ) { diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index e584d0dff4df..ed64cd5ba0da 100644 --- a/includes/api/ApiHelp.php +++ b/includes/api/ApiHelp.php @@ -107,8 +107,8 @@ class ApiHelp extends ApiBase { } /** - * @param $module ApiBase - * @param $type String What type of request is this? e.g. action, query, list, prop, meta, format + * @param $module ApiBase + * @param $type String What type of request is this? e.g. action, query, list, prop, meta, format * @return string */ private function buildModuleHelp( $module, $type ) { diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php index 10b655fb458e..11907818c1db 100644 --- a/includes/api/ApiMove.php +++ b/includes/api/ApiMove.php @@ -148,8 +148,8 @@ class ApiMove extends ApiBase { /** * @param Title $fromTitle * @param Title $toTitle - * @param $reason - * @param $noredirect + * @param $reason + * @param $noredirect * @return array */ public function moveSubpages( $fromTitle, $toTitle, $reason, $noredirect ) { diff --git a/includes/api/ApiQueryRandom.php b/includes/api/ApiQueryRandom.php index 5f85e0e9f2b3..ad26ccef0efa 100644 --- a/includes/api/ApiQueryRandom.php +++ b/includes/api/ApiQueryRandom.php @@ -46,11 +46,11 @@ class ApiQueryRandom extends ApiQueryGeneratorBase { } /** - * @param $randstr - * @param $limit - * @param $namespace + * @param $randstr + * @param $limit + * @param $namespace * @param $resultPageSet ApiPageSet - * @param $redirect + * @param $redirect * @return void */ protected function prepareQuery( $randstr, $limit, $namespace, &$resultPageSet, $redirect ) { diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 0284916ead33..79a8dc96f9c5 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -69,8 +69,8 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { } /** - * @param $pageid - * @param $title + * @param $pageid + * @param $title * @param $rc RecentChange (optional) * @return bool|string */ diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 6e0490d11078..0d13433f99be 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -1133,8 +1133,8 @@ class DatabaseOracle extends DatabaseBase { /** * @throws DBUnexpectedError - * @param string $table - * @param string $field + * @param string $table + * @param string $field * @return ORAField */ function fieldInfo( $table, $field ) { diff --git a/includes/deferred/SqlDataUpdate.php b/includes/deferred/SqlDataUpdate.php index 09d18c49a2c5..121af0418ceb 100644 --- a/includes/deferred/SqlDataUpdate.php +++ b/includes/deferred/SqlDataUpdate.php @@ -40,7 +40,7 @@ abstract class SqlDataUpdate extends DataUpdate { /** @var bool Whether a transaction is open on this object (internal use only!) */ private $mHasTransaction; - /** @var bool Whether this update should be wrapped in a transaction */ + /** @var bool Whether this update should be wrapped in a transaction */ protected $mUseTransaction; /** diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 414b9f80e3d6..f77a4ebf75f1 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -53,16 +53,16 @@ class DifferenceEngine extends ContextSource { /** @var Language */ protected $mDiffLang; - /** @var Title */ + /** @var Title */ public $mOldPage; - /** @var Title */ + /** @var Title */ public $mNewPage; /** @var Revision */ public $mOldRev; - /** @var Revision */ + /** @var Revision */ public $mNewRev; /** @var bool Have the revisions IDs been loaded */ diff --git a/includes/filebackend/filejournal/FileJournal.php b/includes/filebackend/filejournal/FileJournal.php index 3ab9f5d17215..0464e0380495 100644 --- a/includes/filebackend/filejournal/FileJournal.php +++ b/includes/filebackend/filejournal/FileJournal.php @@ -36,7 +36,7 @@ * @since 1.20 */ abstract class FileJournal { - /** @var string */ + /** @var string */ protected $backend; /** @var int */ diff --git a/includes/htmlform/HTMLCheckField.php b/includes/htmlform/HTMLCheckField.php index 237fa320deb0..7baab66f07a3 100644 --- a/includes/htmlform/HTMLCheckField.php +++ b/includes/htmlform/HTMLCheckField.php @@ -50,7 +50,7 @@ class HTMLCheckField extends HTMLFormField { } /** - * @param $request WebRequest + * @param $request WebRequest * * @return String */ diff --git a/includes/htmlform/HTMLMultiSelectField.php b/includes/htmlform/HTMLMultiSelectField.php index 3cf31885f326..f80277107e20 100644 --- a/includes/htmlform/HTMLMultiSelectField.php +++ b/includes/htmlform/HTMLMultiSelectField.php @@ -70,7 +70,7 @@ class HTMLMultiSelectField extends HTMLFormField implements HTMLNestedFilterable } /** - * @param $request WebRequest + * @param $request WebRequest * * @return String */ diff --git a/includes/htmlform/HTMLSelectAndOtherField.php b/includes/htmlform/HTMLSelectAndOtherField.php index 564927f7ddb2..4f501f7f97b8 100644 --- a/includes/htmlform/HTMLSelectAndOtherField.php +++ b/includes/htmlform/HTMLSelectAndOtherField.php @@ -60,7 +60,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField { } /** - * @param $request WebRequest + * @param $request WebRequest * * @return Array("<overall message>","<select value>","<text field value>") */ diff --git a/includes/htmlform/HTMLSelectOrOtherField.php b/includes/htmlform/HTMLSelectOrOtherField.php index e8bcb5b626a2..21f3b778ccfb 100644 --- a/includes/htmlform/HTMLSelectOrOtherField.php +++ b/includes/htmlform/HTMLSelectOrOtherField.php @@ -62,7 +62,7 @@ class HTMLSelectOrOtherField extends HTMLTextField { } /** - * @param $request WebRequest + * @param $request WebRequest * * @return String */ diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php index 0e8d1def6e98..2ec4f69cffb8 100644 --- a/includes/logging/LogPage.php +++ b/includes/logging/LogPage.php @@ -358,10 +358,10 @@ class LogPage { /** * @todo Document - * @param string $type - * @param Language|null $lang - * @param Title $title - * @param array $params + * @param string $type + * @param Language|null $lang + * @param Title $title + * @param array $params * @return string */ protected static function getTitleLink( $type, $lang, $title, &$params ) { diff --git a/includes/media/Bitmap_ClientOnly.php b/includes/media/Bitmap_ClientOnly.php index 15ec794786b4..d29626900da7 100644 --- a/includes/media/Bitmap_ClientOnly.php +++ b/includes/media/Bitmap_ClientOnly.php @@ -32,7 +32,7 @@ class BitmapHandler_ClientOnly extends BitmapHandler { /** * @param $image File - * @param $params + * @param $params * @return bool */ function normaliseParams( $image, &$params ) { diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php index d9ea54c01373..d39b288aa39b 100644 --- a/includes/objectcache/MemcachedClient.php +++ b/includes/objectcache/MemcachedClient.php @@ -102,8 +102,8 @@ class MWMemcached { /** * Command statistics * - * @var array - * @access public + * @var array + * @access public */ var $stats; @@ -113,112 +113,112 @@ class MWMemcached { /** * Cached Sockets that are connected * - * @var array - * @access private + * @var array + * @access private */ var $_cache_sock; /** * Current debug status; 0 - none to 9 - profiling * - * @var boolean - * @access private + * @var boolean + * @access private */ var $_debug; /** * Dead hosts, assoc array, 'host'=>'unixtime when ok to check again' * - * @var array - * @access private + * @var array + * @access private */ var $_host_dead; /** * Is compression available? * - * @var boolean - * @access private + * @var boolean + * @access private */ var $_have_zlib; /** * Do we want to use compression? * - * @var boolean - * @access private + * @var boolean + * @access private */ var $_compress_enable; /** * At how many bytes should we compress? * - * @var integer - * @access private + * @var integer + * @access private */ var $_compress_threshold; /** * Are we using persistent links? * - * @var boolean - * @access private + * @var boolean + * @access private */ var $_persistent; /** * If only using one server; contains ip:port to connect to * - * @var string - * @access private + * @var string + * @access private */ var $_single_sock; /** * Array containing ip:port or array(ip:port, weight) * - * @var array - * @access private + * @var array + * @access private */ var $_servers; /** * Our bit buckets * - * @var array - * @access private + * @var array + * @access private */ var $_buckets; /** * Total # of bit buckets we have * - * @var integer - * @access private + * @var integer + * @access private */ var $_bucketcount; /** * # of total servers we have * - * @var integer - * @access private + * @var integer + * @access private */ var $_active; /** * Stream timeout in seconds. Applies for example to fread() * - * @var integer - * @access private + * @var integer + * @access private */ var $_timeout_seconds; /** * Stream timeout in microseconds * - * @var integer - * @access private + * @var integer + * @access private */ var $_timeout_microseconds; @@ -243,7 +243,7 @@ class MWMemcached { * * @param array $args Associative array of settings * - * @return mixed + * @return mixed */ public function __construct( $args ) { $this->set_servers( isset( $args['servers'] ) ? $args['servers'] : array() ); @@ -708,7 +708,7 @@ class MWMemcached { * * @param string $sock socket to close * - * @access private + * @access private */ function _close_sock( $sock ) { $host = array_search( $sock, $this->_cache_sock ); @@ -725,8 +725,8 @@ class MWMemcached { * @param $sock Integer: socket to connect * @param string $host Host:IP to connect to * - * @return boolean - * @access private + * @return boolean + * @access private */ function _connect_sock( &$sock, $host ) { list( $ip, $port ) = preg_split( '/:(?=\d)/', $host ); @@ -767,7 +767,7 @@ class MWMemcached { * * @param string $sock socket to mark as dead * - * @access private + * @access private */ function _dead_sock( $sock ) { $host = array_search( $sock, $this->_cache_sock ); diff --git a/includes/parser/CacheTime.php b/includes/parser/CacheTime.php index 6dda64cf0d5f..dfe3c800b59b 100644 --- a/includes/parser/CacheTime.php +++ b/includes/parser/CacheTime.php @@ -27,7 +27,7 @@ * @ingroup Parser */ class CacheTime { - /** @var array|bool ParserOptions which have been taken into account to + /** @var array|bool ParserOptions which have been taken into account to * produce output or false if not available. */ public $mUsedOptions; diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php index ad6bc0f43ca8..8fa39fa64858 100644 --- a/includes/parser/CoreParserFunctions.php +++ b/includes/parser/CoreParserFunctions.php @@ -92,7 +92,7 @@ class CoreParserFunctions { /** * @param $parser Parser - * @param $date + * @param $date * @param null $defaultPref * @return mixed|string */ @@ -787,7 +787,7 @@ class CoreParserFunctions { /** * @param $parser Parser - * @param $text + * @param $text * @return string */ static function anchorencode( $parser, $text ) { diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 0fefe699eb5e..d7584ca67fa7 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -1731,10 +1731,10 @@ class Parser { * @param $url String * @return String * - * @todo This can merge genuinely required bits in the path or query string, - * breaking legit URLs. A proper fix would treat the various parts of - * the URL differently; as a workaround, just use the output for - * statistical records, not for actual linking/output. + * @todo This can merge genuinely required bits in the path or query string, + * breaking legit URLs. A proper fix would treat the various parts of + * the URL differently; as a workaround, just use the output for + * statistical records, not for actual linking/output. */ static function replaceUnusualEscapes( $url ) { return preg_replace_callback( '/%[0-9A-Fa-f]{2}/', diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php index deaf2882bd3b..d6edb214260f 100644 --- a/includes/parser/Preprocessor_Hash.php +++ b/includes/parser/Preprocessor_Hash.php @@ -1619,7 +1619,7 @@ class PPNode_Hash_Tree implements PPNode { } /** - * @param $i + * @param $i * @return bool */ function item( $i ) { diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php index 5f3f18eaebf3..5b94453450af 100644 --- a/includes/parser/StripState.php +++ b/includes/parser/StripState.php @@ -97,7 +97,7 @@ class StripState { } /** - * @param $text + * @param $text * @return mixed */ function unstripBoth( $text ) { diff --git a/includes/revisiondelete/RevisionDeleteUser.php b/includes/revisiondelete/RevisionDeleteUser.php index 4505ee10c2bb..b0b225300132 100644 --- a/includes/revisiondelete/RevisionDeleteUser.php +++ b/includes/revisiondelete/RevisionDeleteUser.php @@ -33,10 +33,10 @@ class RevisionDeleteUser { /** * Update *_deleted bitfields in various tables to hide or unhide usernames - * @param $name String username - * @param $userId Int user id - * @param $op String operator '|' or '&' - * @param $dbw null|DatabaseBase, if you happen to have one lying around + * @param $name String username + * @param $userId Int user id + * @param $op String operator '|' or '&' + * @param $dbw null|DatabaseBase, if you happen to have one lying around * @return bool */ private static function setUsernameBitfields( $name, $userId, $op, $dbw ) { diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php index 02e1ddae528f..bea846048ff6 100644 --- a/includes/revisiondelete/RevisionDeleter.php +++ b/includes/revisiondelete/RevisionDeleter.php @@ -207,7 +207,7 @@ class RevisionDeleter { * so that this key can be used instead. * * @param $title Title - * @param $revid + * @param $revid * @return bool|mixed */ public static function checkRevisionExistence( $title, $revid ) { diff --git a/includes/specialpage/FormSpecialPage.php b/includes/specialpage/FormSpecialPage.php index 90f82e0f7a13..74962620e711 100644 --- a/includes/specialpage/FormSpecialPage.php +++ b/includes/specialpage/FormSpecialPage.php @@ -113,7 +113,7 @@ abstract class FormSpecialPage extends SpecialPage { /** * Process the form on POST submission. - * @param $data Array + * @param $data Array * @return Bool|Array true for success, false for didn't-try, array of errors on failure */ abstract public function onSubmit( array $data ); diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index 57f23d36fa1f..9b1b2b3f13d2 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -35,7 +35,7 @@ class SpecialBlock extends FormSpecialPage { /// @var Block::TYPE_ constant protected $type; - /// @var User|String the previous block target + /// @var User|String the previous block target protected $previousTarget; /// @var Bool whether the previous submission of the form asked for HideUser @@ -593,8 +593,8 @@ class SpecialBlock extends FormSpecialPage { /** * Given the form data, actually implement a block - * @param $data Array - * @param $context IContextSource + * @param $data Array + * @param $context IContextSource * @return Bool|String */ public static function processForm( array $data, IContextSource $context ) { @@ -947,7 +947,7 @@ class SpecialBlock extends FormSpecialPage { /** * Process the form on POST submission. - * @param $data Array + * @param $data Array * @return Bool|Array true for success, false for didn't-try, array of errors on failure */ public function onSubmit( array $data ) { diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php index 29722c8f08e2..1bd4228ec6f9 100644 --- a/includes/specials/SpecialImport.php +++ b/includes/specials/SpecialImport.php @@ -448,8 +448,8 @@ class ImportReporter extends ContextSource { * @param Title $title * @param Title $origTitle * @param int $revisionCount - * @param $successCount - * @param $pageInfo + * @param $successCount + * @param $pageInfo * @return void */ function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) { diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index db9a9927e36b..f8e5c841c566 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -682,7 +682,7 @@ class UserrightsPage extends SpecialPage { } /** - * @param $group String: the name of the group to check + * @param $group String: the name of the group to check * @return bool Can we remove the group? */ private function canRemove( $group ) { diff --git a/languages/Language.php b/languages/Language.php index 2b98a18305cb..1ad2b7a37e61 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -814,7 +814,7 @@ class Language { } /** - * @param $image + * @param $image * @return array|null */ function getImageFile( $image ) { @@ -829,7 +829,7 @@ class Language { } /** - * @param $tog + * @param $tog * @return string */ function getUserToggle( $tog ) { diff --git a/maintenance/benchmarks/bench_delete_truncate.php b/maintenance/benchmarks/bench_delete_truncate.php index 3eff534b928f..9f11c63c314b 100644 --- a/maintenance/benchmarks/bench_delete_truncate.php +++ b/maintenance/benchmarks/bench_delete_truncate.php @@ -70,7 +70,7 @@ class BenchmarkDeleteTruncate extends Benchmarker { } /** - * @param $dbw DatabaseBase + * @param $dbw DatabaseBase * @return void */ private function insertData( $dbw ) { @@ -83,7 +83,7 @@ class BenchmarkDeleteTruncate extends Benchmarker { } /** - * @param $dbw DatabaseBase + * @param $dbw DatabaseBase * @return void */ private function delete( $dbw ) { @@ -91,7 +91,7 @@ class BenchmarkDeleteTruncate extends Benchmarker { } /** - * @param $dbw DatabaseBase + * @param $dbw DatabaseBase * @return void */ private function truncate( $dbw ) { diff --git a/tests/phpunit/MediaWikiPHPUnitTestListener.php b/tests/phpunit/MediaWikiPHPUnitTestListener.php index 7237ef320fd7..c8ec4114d0f2 100644 --- a/tests/phpunit/MediaWikiPHPUnitTestListener.php +++ b/tests/phpunit/MediaWikiPHPUnitTestListener.php @@ -30,9 +30,9 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * An error occurred. * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time + * @param PHPUnit_Framework_Test $test + * @param Exception $e + * @param float $time */ public function addError( PHPUnit_Framework_Test $test, Exception $e, $time ) { wfDebugLog( $this->logChannel, 'ERROR in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) ); @@ -41,9 +41,9 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * A failure occurred. * - * @param PHPUnit_Framework_Test $test - * @param PHPUnit_Framework_AssertionFailedError $e - * @param float $time + * @param PHPUnit_Framework_Test $test + * @param PHPUnit_Framework_AssertionFailedError $e + * @param float $time */ public function addFailure( PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time ) { wfDebugLog( $this->logChannel, 'FAILURE in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) ); @@ -52,9 +52,9 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * Incomplete test. * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time + * @param PHPUnit_Framework_Test $test + * @param Exception $e + * @param float $time */ public function addIncompleteTest( PHPUnit_Framework_Test $test, Exception $e, $time ) { wfDebugLog( $this->logChannel, 'Incomplete test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) ); @@ -63,11 +63,11 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * Skipped test. * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time + * @param PHPUnit_Framework_Test $test + * @param Exception $e + * @param float $time * - * @since Method available since Release 3.0.0 + * @since Method available since Release 3.0.0 */ public function addSkippedTest( PHPUnit_Framework_Test $test, Exception $e, $time ) { wfDebugLog( $this->logChannel, 'Skipped test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) ); @@ -76,8 +76,8 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * A test suite started. * - * @param PHPUnit_Framework_TestSuite $suite - * @since Method available since Release 2.2.0 + * @param PHPUnit_Framework_TestSuite $suite + * @since Method available since Release 2.2.0 */ public function startTestSuite( PHPUnit_Framework_TestSuite $suite ) { wfDebugLog( $this->logChannel, 'START suite ' . $suite->getName() ); @@ -86,8 +86,8 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * A test suite ended. * - * @param PHPUnit_Framework_TestSuite $suite - * @since Method available since Release 2.2.0 + * @param PHPUnit_Framework_TestSuite $suite + * @since Method available since Release 2.2.0 */ public function endTestSuite( PHPUnit_Framework_TestSuite $suite ) { wfDebugLog( $this->logChannel, 'END suite ' . $suite->getName() ); @@ -96,7 +96,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * A test started. * - * @param PHPUnit_Framework_Test $test + * @param PHPUnit_Framework_Test $test */ public function startTest( PHPUnit_Framework_Test $test ) { wfDebugLog( $this->logChannel, 'Start test ' . $this->getTestName( $test ) ); @@ -105,8 +105,8 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener { /** * A test ended. * - * @param PHPUnit_Framework_Test $test - * @param float $time + * @param PHPUnit_Framework_Test $test + * @param float $time */ public function endTest( PHPUnit_Framework_Test $test, $time ) { wfDebugLog( $this->logChannel, 'End test ' . $this->getTestName( $test ) ); |