jenkins-bot has submitted this change and it was merged. Change subject: docs: Remove odd colons after @todo ......................................................................
docs: Remove odd colons after @todo Most were this way already: https://doc.wikimedia.org/mediawiki-core/master/php/html/todo.html Ran a find/replace on the odd ones. Also made them all lower case. Change-Id: I70c6a69344ddebc603e9a1c1d87e3cc4f4f4c560 --- M includes/Article.php M includes/Block.php M includes/DefaultSettings.php M includes/EditPage.php M includes/Export.php M includes/LinksUpdate.php M includes/Revision.php M includes/SiteStats.php M includes/SqlDataUpdate.php M includes/Status.php M includes/Title.php M includes/WikiPage.php M includes/actions/HistoryAction.php M includes/api/ApiEditPage.php M includes/cache/FileCacheBase.php M includes/cache/HTMLFileCache.php M includes/cache/ResourceFileCache.php M includes/content/Content.php M includes/content/CssContent.php M includes/content/JavaScriptContent.php M includes/content/TextContent.php M includes/db/DatabaseSqlite.php M includes/diff/DifferenceEngine.php M includes/filebackend/FileOp.php M includes/job/jobs/PublishStashedFileJob.php M includes/media/SVG.php M includes/resourceloader/ResourceLoader.php M includes/search/SearchSqlite.php M includes/site/MediaWikiSite.php M includes/specials/SpecialPasswordReset.php M includes/specials/SpecialWatchlist.php M includes/upload/UploadBase.php M languages/LanguageConverter.php M maintenance/fuzz-tester.php M maintenance/namespaceDupes.php M resources/Resources.php M resources/mediawiki.page/mediawiki.page.watch.ajax.js M tests/phpunit/MediaWikiTestCase.php M tests/phpunit/includes/LinksUpdateTest.php M tests/phpunit/includes/RecentChangeTest.php M tests/phpunit/includes/RevisionStorageTest.php M tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php M tests/phpunit/includes/TitlePermissionTest.php M tests/phpunit/includes/WikiPageTest.php M tests/phpunit/includes/content/JavaScriptContentTest.php M tests/phpunit/includes/content/TextContentTest.php M tests/phpunit/includes/content/WikitextContentTest.php M tests/phpunit/includes/db/DatabaseSqliteTest.php M tests/phpunit/includes/filebackend/FileBackendTest.php M tests/phpunit/includes/jobqueue/JobQueueTest.php M tests/phpunit/includes/parser/NewParserTest.php M tests/phpunit/includes/search/SearchEngineTest.php M tests/phpunit/maintenance/backupTextPassTest.php M tests/phpunit/maintenance/backup_PageTest.php M thumb.php 55 files changed, 85 insertions(+), 82 deletions(-) Approvals: IAlex: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Article.php b/includes/Article.php index 87b94ae..d23bebf 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -25,7 +25,7 @@ * * This maintains WikiPage functions for backwards compatibility. * - * @todo move and rewrite code to an Action class + * @todo Move and rewrite code to an Action class * * See design.txt for an overview. * Note: edit user interface and cache support functions have been @@ -385,7 +385,8 @@ $content = $this->fetchContentObject(); - $this->mContent = ContentHandler::getContentText( $content ); #@todo: get rid of mContent everywhere! + // @todo Get rid of mContent everywhere! + $this->mContent = ContentHandler::getContentText( $content ); ContentHandler::runLegacyHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) ); wfProfileOut( __METHOD__ ); @@ -787,7 +788,7 @@ * Show a diff page according to current request variables. For use within * Article::view() only, other callers should use the DifferenceEngine class. * - * @todo: make protected + * @todo Make protected */ public function showDiffPage() { $request = $this->getContext()->getRequest(); diff --git a/includes/Block.php b/includes/Block.php index 47ddc7d..d2f430e 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -683,7 +683,7 @@ if ( $ipblock ) { # Check if the block is an autoblock and would exceed the user block # if renewed. If so, do nothing, otherwise prolong the block time... - if ( $ipblock->mAuto && // @TODO: why not compare $ipblock->mExpiry? + if ( $ipblock->mAuto && // @todo Why not compare $ipblock->mExpiry? $this->mExpiry > Block::getAutoblockExpiry( $ipblock->mTimestamp ) ) { # Reset block timestamp to now and its expiry to diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 4e19642..296b71d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -6331,7 +6331,7 @@ * of texts are also rendered as wikitext, it only means that links, magic words, etc will have * the effect on the database they would have on a wikitext page. * - * @todo: On the long run, it would be nice to put categories etc into a separate structure, + * @todo On the long run, it would be nice to put categories etc into a separate structure, * or at least parse only the contents of comments in the scripts. * * @since 1.21 diff --git a/includes/EditPage.php b/includes/EditPage.php index c97431a..27f4556 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -2138,7 +2138,7 @@ } } - //@todo: add EditForm plugin interface and use it here! + // @todo add EditForm plugin interface and use it here! // search for textarea1 and textares2, and allow EditForm to override all uses. $wgOut->addHTML( Html::openElement( 'form', array( 'id' => self::EDITFORM_ID, 'name' => self::EDITFORM_ID, 'method' => 'post', 'action' => $this->getActionURL( $this->getContextTitle() ), diff --git a/includes/Export.php b/includes/Export.php index e533dbc..a26e853 100644 --- a/includes/Export.php +++ b/includes/Export.php @@ -689,7 +689,7 @@ $content_model = strval( $row->rev_content_model ); } else { // probably using $wgContentHandlerUseDB = false; - // @todo: test! + // @todo test! $title = Title::makeTitle( $row->page_namespace, $row->page_title ); $content_model = ContentHandler::getDefaultModelFor( $title ); } @@ -700,7 +700,7 @@ $content_format = strval( $row->rev_content_format ); } else { // probably using $wgContentHandlerUseDB = false; - // @todo: test! + // @todo test! $content_handler = ContentHandler::getForModelID( $content_model ); $content_format = $content_handler->getDefaultFormat(); } diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php index 8c6d762..4b1b5b8 100644 --- a/includes/LinksUpdate.php +++ b/includes/LinksUpdate.php @@ -27,7 +27,7 @@ */ class LinksUpdate extends SqlDataUpdate { - // @todo: make members protected, but make sure extensions don't break + // @todo make members protected, but make sure extensions don't break public $mId, //!< Page ID of the article linked from $mTitle, //!< Title object of the article linked from diff --git a/includes/Revision.php b/includes/Revision.php index 1a7d825..47626a2 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -560,7 +560,7 @@ # if we have a content object, use it to set the model and type if ( !empty( $row['content'] ) ) { - //@todo: when is that set? test with external store setup! check out insertOn() [dk] + // @todo when is that set? test with external store setup! check out insertOn() [dk] if ( !empty( $row['text_id'] ) ) { throw new MWException( "Text already stored in external store (id {$row['text_id']}), " . "can't serialize content object" ); @@ -918,7 +918,7 @@ * to the $audience parameter * * @deprecated in 1.21, use getContent() instead - * @todo: replace usage in core + * @todo Replace usage in core * @return String */ public function getText( $audience = self::FOR_PUBLIC, User $user = null ) { diff --git a/includes/SiteStats.php b/includes/SiteStats.php index 66bc9ee..02e1911 100644 --- a/includes/SiteStats.php +++ b/includes/SiteStats.php @@ -258,7 +258,7 @@ protected $users = 0; protected $images = 0; - // @TODO: deprecate this constructor + // @todo deprecate this constructor function __construct( $views, $edits, $good, $pages = 0, $users = 0 ) { $this->views = $views; $this->edits = $edits; diff --git a/includes/SqlDataUpdate.php b/includes/SqlDataUpdate.php index 79dcdc5..51188d8 100644 --- a/includes/SqlDataUpdate.php +++ b/includes/SqlDataUpdate.php @@ -56,7 +56,7 @@ $this->mOptions = array( 'FOR UPDATE' ); } - // @todo: get connection only when it's needed? make sure that doesn't break anything, especially transactions! + // @todo get connection only when it's needed? make sure that doesn't break anything, especially transactions! $this->mDb = wfGetDB( DB_MASTER ); $this->mWithTransaction = $withTransaction; diff --git a/includes/Status.php b/includes/Status.php index 64a3c60..f0253df 100644 --- a/includes/Status.php +++ b/includes/Status.php @@ -234,7 +234,7 @@ * * @note: this does not perform a full wikitext to HTML conversion, it merely applies * a message transformation. - * @todo: figure out whether that is actually The Right Thing. + * @todo figure out whether that is actually The Right Thing. */ public function getHTML( $shortContext = false, $longContext = false ) { $text = $this->getWikiText( $shortContext, $longContext ); diff --git a/includes/Title.php b/includes/Title.php index c97056f..14915e5 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -944,7 +944,7 @@ * @return Bool */ public function isConversionTable() { - //@todo: ConversionTable should become a separate content model. + // @todo ConversionTable should become a separate content model. return $this->getNamespace() == NS_MEDIAWIKI && strpos( $this->getText(), 'Conversiontable/' ) === 0; diff --git a/includes/WikiPage.php b/includes/WikiPage.php index da6fff3..b8f4911 100644 --- a/includes/WikiPage.php +++ b/includes/WikiPage.php @@ -187,7 +187,7 @@ * (and only when) $wgActions[$action] === true. This allows subclasses * to override the default behavior. * - * @todo: move this UI stuff somewhere else + * @todo Move this UI stuff somewhere else * * @return Array */ @@ -648,7 +648,7 @@ * @return String|false The text of the current revision * @deprecated as of 1.21, getContent() should be used instead. */ - public function getText( $audience = Revision::FOR_PUBLIC, User $user = null ) { // @todo: deprecated, replace usage! + public function getText( $audience = Revision::FOR_PUBLIC, User $user = null ) { // @todo deprecated, replace usage! ContentHandler::deprecated( __METHOD__, '1.21' ); $this->loadLastEdit(); @@ -1175,7 +1175,7 @@ } if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { - // @todo: move this logic to MessageCache + // @todo move this logic to MessageCache if ( $this->exists() ) { // NOTE: use transclusion text for messages. @@ -1459,8 +1459,8 @@ * * @return boolean whether sections are supported. * - * @todo: the skin should check this and not offer section functionality if sections are not supported. - * @todo: the EditPage should check this and not offer section functionality if sections are not supported. + * @todo The skin should check this and not offer section functionality if sections are not supported. + * @todo The EditPage should check this and not offer section functionality if sections are not supported. */ public function supportsSections() { return $this->getContentHandler()->supportsSections(); @@ -1956,7 +1956,7 @@ $options = $this->getContentHandler()->makeParserOptions( $context ); if ( $this->getTitle()->isConversionTable() ) { - //@todo: ConversionTable should become a separate content model, so we don't need special cases like this one. + // @todo ConversionTable should become a separate content model, so we don't need special cases like this one. $options->disableContentConversion(); } @@ -2110,7 +2110,7 @@ DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, $good, $total ) ); DeferredUpdates::addUpdate( new SearchUpdate( $id, $title, $content->getTextForSearchIndex() ) ); - // @TODO: let the search engine decide what to do with the content object + // @todo let the search engine decide what to do with the content object // If this is another user's talk page, update newtalk. // Don't do this if $options['changed'] = false (null-edits) nor if @@ -2673,7 +2673,7 @@ * performs permissions checks on $user, then calls commitRollback() * to do the dirty work * - * @todo: separate the business/permission stuff out from backend code + * @todo Separate the business/permission stuff out from backend code * * @param string $fromP Name of the user whose edits to rollback. * @param string $summary Custom summary. Set to default summary if empty. @@ -2941,7 +2941,7 @@ * Purge caches on page update etc * * @param $title Title object - * @todo: verify that $title is always a Title object (and never false or null), add Title hint to parameter $title + * @todo Verify that $title is always a Title object (and never false or null), add Title hint to parameter $title */ public static function onArticleEdit( $title ) { // Invalidate caches of articles which include this page @@ -3403,7 +3403,7 @@ function doWork() { global $wgUseFileCache; - // @todo: several of the methods called on $this->page are not declared in Page, but present + // @todo several of the methods called on $this->page are not declared in Page, but present // in WikiPage and delegated by Article. $isCurrent = $this->revid === $this->page->getLatest(); diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 911fd58..f43736b 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -789,7 +789,7 @@ if ( $this->getNumRows() > 1 ) { $id = $rev->getId(); $radio = array( 'type' => 'radio', 'value' => $id ); - /** @todo: move title texts to javascript */ + /** @todo Move title texts to javascript */ if ( $firstInList ) { $first = Xml::element( 'input', array_merge( $radio, array( diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index e7e5e1d..3d0b425 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -146,7 +146,7 @@ } } - // @todo: Add support for appending/prepending to the Content interface + // @todo Add support for appending/prepending to the Content interface if ( !( $content instanceof TextContent ) ) { $mode = $contentHandler->getModelID(); diff --git a/includes/cache/FileCacheBase.php b/includes/cache/FileCacheBase.php index 7310f61..d4bf5ee 100644 --- a/includes/cache/FileCacheBase.php +++ b/includes/cache/FileCacheBase.php @@ -35,7 +35,7 @@ /* lazy loaded */ protected $mCached; - /* @TODO: configurable? */ + /* @todo configurable? */ const MISS_FACTOR = 15; // log 1 every MISS_FACTOR cache misses const MISS_TTL_SEC = 3600; // how many seconds ago is "recent" diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php index 8233481..ab37911 100644 --- a/includes/cache/HTMLFileCache.php +++ b/includes/cache/HTMLFileCache.php @@ -182,7 +182,7 @@ // gzip output to buffer as needed and set headers... if ( $this->useGzip() ) { - // @TODO: ugly wfClientAcceptsGzip() function - use context! + // @todo Ugly wfClientAcceptsGzip() function - use context! if ( wfClientAcceptsGzip() ) { header( 'Content-Encoding: gzip' ); return $compressed; diff --git a/includes/cache/ResourceFileCache.php b/includes/cache/ResourceFileCache.php index 61f1e8c..2ad7b85 100644 --- a/includes/cache/ResourceFileCache.php +++ b/includes/cache/ResourceFileCache.php @@ -29,7 +29,7 @@ class ResourceFileCache extends FileCacheBase { protected $mCacheWorthy; - /* @TODO: configurable? */ + /* @todo configurable? */ const MISS_THRESHOLD = 360; // 6/min * 60 min /** diff --git a/includes/content/Content.php b/includes/content/Content.php index 72729b0..5a90e09 100644 --- a/includes/content/Content.php +++ b/includes/content/Content.php @@ -40,8 +40,8 @@ * building a full text search index. If no useful representation exists, * this method returns an empty string. * - * @todo: test that this actually works - * @todo: make sure this also works with LuceneSearch / WikiSearch + * @todo Test that this actually works + * @todo Make sure this also works with LuceneSearch / WikiSearch */ public function getTextForSearchIndex(); @@ -51,11 +51,11 @@ * @return string|false The wikitext to include when another page includes this * content, or false if the content is not includable in a wikitext page. * - * @todo allow native handling, bypassing wikitext representation, like - * for includable special pages. - * @todo allow transclusion into other content models than Wikitext! - * @todo used in WikiPage and MessageCache to get message text. Not so - * nice. What should we use instead?! + * @todo Allow native handling, bypassing wikitext representation, like + * for includable special pages. + * @todo Allow transclusion into other content models than Wikitext! + * @todo Used in WikiPage and MessageCache to get message text. Not so + * nice. What should we use instead?! */ public function getWikitextForTransclusion(); diff --git a/includes/content/CssContent.php b/includes/content/CssContent.php index 569d122..03cc2d0 100644 --- a/includes/content/CssContent.php +++ b/includes/content/CssContent.php @@ -46,7 +46,7 @@ */ public function preSaveTransform( Title $title, User $user, ParserOptions $popts ) { global $wgParser; - // @todo: make pre-save transformation optional for script pages + // @todo Make pre-save transformation optional for script pages $text = $this->getNativeData(); $pst = $wgParser->preSaveTransform( $text, $title, $user, $popts ); diff --git a/includes/content/JavaScriptContent.php b/includes/content/JavaScriptContent.php index 9cd947f..2ae572b 100644 --- a/includes/content/JavaScriptContent.php +++ b/includes/content/JavaScriptContent.php @@ -46,7 +46,7 @@ */ public function preSaveTransform( Title $title, User $user, ParserOptions $popts ) { global $wgParser; - // @todo: make pre-save transformation optional for script pages + // @todo Make pre-save transformation optional for script pages // See bug #32858 $text = $this->getNativeData(); diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php index 8fafcb6..f66dacd 100644 --- a/includes/content/TextContent.php +++ b/includes/content/TextContent.php @@ -171,7 +171,7 @@ $this->checkModelID( $that->getModel() ); - # @todo: could implement this in DifferenceEngine and just delegate here? + // @todo could implement this in DifferenceEngine and just delegate here? if ( !$lang ) { $lang = $wgContLang; diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index 53a4dcf..32c7789 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -68,7 +68,7 @@ } /** - * @todo: check if it should be true like parent class + * @todo Check if it should be true like parent class * * @return bool */ diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 8ee2b82..4ee5014 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -505,7 +505,7 @@ if ( $this->mNewPage->isCssJsSubpage() || $this->mNewPage->isCssOrJsPage() ) { // Stolen from Article::view --AG 2007-10-11 // Give hooks a chance to customise the output - // @TODO: standardize this crap into one function + // @todo standardize this crap into one function if ( ContentHandler::runLegacyHooks( 'ShowRawCssJs', array( $this->mNewContent, $this->mNewPage, $out ) ) ) { // NOTE: deprecated hook, B/C only // use the content object's own rendering diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php index 80afcf2..e4059d7 100644 --- a/includes/filebackend/FileOp.php +++ b/includes/filebackend/FileOp.php @@ -64,7 +64,7 @@ final public function __construct( FileBackendStore $backend, array $params ) { $this->backend = $backend; list( $required, $optional ) = $this->allowedParams(); - // @TODO: normalizeAnyStoragePaths() calls are overzealous, use a parameter list + // @todo normalizeAnyStoragePaths() calls are overzealous, use a parameter list foreach ( $required as $name ) { if ( isset( $params[$name] ) ) { // Normalize paths so the paths to the same file have the same string diff --git a/includes/job/jobs/PublishStashedFileJob.php b/includes/job/jobs/PublishStashedFileJob.php index 625e8aa..5114dc0 100644 --- a/includes/job/jobs/PublishStashedFileJob.php +++ b/includes/job/jobs/PublishStashedFileJob.php @@ -48,7 +48,7 @@ ); $upload = new UploadFromStash( $user ); - // @TODO: initialize() causes a GET, ideally we could frontload the antivirus + // @todo initialize() causes a GET, ideally we could frontload the antivirus // checks and anything else to the stash stage (which includes concatenation and // the local file is thus already there). That way, instead of GET+PUT, there could // just be a COPY operation from the stash to the public zone. diff --git a/includes/media/SVG.php b/includes/media/SVG.php index 2987588..a133f6f 100644 --- a/includes/media/SVG.php +++ b/includes/media/SVG.php @@ -263,7 +263,7 @@ $metadata = array( 'version' => self::SVG_METADATA_VERSION ); try { $metadata += SVGMetadataExtractor::getMetadata( $filename ); - } catch ( MWException $e ) { // @TODO: SVG specific exceptions + } catch ( MWException $e ) { // @todo SVG specific exceptions // File not found, broken, etc. $metadata['error'] = array( 'message' => $e->getMessage(), diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index fcca5a1..a3c3b10 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -364,7 +364,7 @@ * @return Array */ public function getTestModuleNames( $framework = 'all' ) { - /// @TODO: api siteinfo prop testmodulenames modulenames + /// @todo api siteinfo prop testmodulenames modulenames if ( $framework == 'all' ) { return $this->testModuleNames; } elseif ( isset( $this->testModuleNames[$framework] ) && is_array( $this->testModuleNames[$framework] ) ) { diff --git a/includes/search/SearchSqlite.php b/includes/search/SearchSqlite.php index 71fd021..554181f 100644 --- a/includes/search/SearchSqlite.php +++ b/includes/search/SearchSqlite.php @@ -298,7 +298,7 @@ if ( !$this->fulltextSearchSupported() ) { return; } - // @todo: find a method to do it in a single request, + // @todo find a method to do it in a single request, // couldn't do it so far due to typelessness of FTS3 tables. $dbw = wfGetDB( DB_MASTER ); diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php index 98004a2..f3b8a0c 100644 --- a/includes/site/MediaWikiSite.php +++ b/includes/site/MediaWikiSite.php @@ -123,7 +123,7 @@ 'converttitles' => true, 'format' => 'json', 'titles' => $pageName, - //@todo: options for maxlag and maxage + // @todo options for maxlag and maxage // Note that maxlag will lead to a long delay before a reply is made, // but that maxage can avoid the extreme delay. On the other hand // maxage could be nice to use anyhow as it stops unnecessary requests. @@ -133,7 +133,7 @@ $url = wfAppendQuery( $this->getFileUrl( 'api.php' ), $args ); // Go on call the external site - //@todo: we need a good way to specify a timeout here. + // @todo we need a good way to specify a timeout here. $ret = Http::get( $url ); } diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php index df9ed57..d1f8136 100644 --- a/includes/specials/SpecialPasswordReset.php +++ b/includes/specials/SpecialPasswordReset.php @@ -284,7 +284,7 @@ public function onSuccess() { if ( $this->getUser()->isAllowed( 'passwordreset' ) && $this->email != null ) { - // @todo: Logging + // @todo Logging if ( $this->result->isGood() ) { $this->getOutput()->addWikiMsg( 'passwordreset-emailsent-capture' ); diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 0296a63..a5e2e63 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -99,7 +99,7 @@ return; } - // @TODO: use FormOptions! + // @todo use FormOptions! $defaults = array( /* float */ 'days' => floatval( $user->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */ /* bool */ 'hideMinor' => (int)$user->getBoolOption( 'watchlisthideminor' ), diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php index fa62a99..17da80e 100644 --- a/includes/upload/UploadBase.php +++ b/includes/upload/UploadBase.php @@ -256,7 +256,7 @@ wfProfileIn( __METHOD__ ); $repo = RepoGroup::singleton()->getLocalRepo(); if ( $repo->isVirtualUrl( $srcPath ) ) { - // @TODO: just make uploads work with storage paths + // @todo just make uploads work with storage paths // UploadFromStash loads files via virtual URLs $tmpFile = $repo->getLocalCopy( $srcPath ); $tmpFile->bind( $this ); // keep alive with $this diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 3770b9b..0186ccf 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -952,7 +952,7 @@ $txt = $revision->getContent( Revision::RAW )->getNativeData(); } - //@todo: in the future, use a specialized content model, perhaps based on json! + // @todo in the future, use a specialized content model, perhaps based on json! } } } diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php index b3d8174..ca15d74 100644 --- a/maintenance/fuzz-tester.php +++ b/maintenance/fuzz-tester.php @@ -1973,7 +1973,7 @@ ** returns the help screen - so currently a lot of the tests aren't actually doing much ** because something wasn't right in the query. ** - ** @todo: Incomplete / unfinished; Runs too fast (suggests not much testing going on). + ** @todo Incomplete / unfinished; Runs too fast (suggests not much testing going on). */ class api extends pageTest { diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php index 61ebe62..555feaa 100644 --- a/maintenance/namespaceDupes.php +++ b/maintenance/namespaceDupes.php @@ -185,7 +185,7 @@ } /** - * @todo: do this for reals + * @todo Do this for real * @param $key * @param $prefix * @param $fix diff --git a/resources/Resources.php b/resources/Resources.php index 5bf4061..ddcefda 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -930,7 +930,7 @@ 'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js', ), 'mediawiki.special.upload' => array( - // @TODO: merge in remainder of mediawiki.legacy.upload + // @todo merge in remainder of mediawiki.legacy.upload 'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js', 'messages' => array( 'widthheight', diff --git a/resources/mediawiki.page/mediawiki.page.watch.ajax.js b/resources/mediawiki.page/mediawiki.page.watch.ajax.js index f945fa9..5ba77a1 100644 --- a/resources/mediawiki.page/mediawiki.page.watch.ajax.js +++ b/resources/mediawiki.page/mediawiki.page.watch.ajax.js @@ -71,7 +71,7 @@ actionPaths = mw.config.get( 'wgActionPaths' ); - // @todo: Does MediaWiki give action path or query param + // @todo Does MediaWiki give action path or query param // precedence ? If the former, move this to the bottom action = mw.util.getParamValue( 'action', url ); if ( action !== null ) { diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index 440f866..25ba29e 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -173,7 +173,7 @@ $this->called['setUp'] = 1; /* - //@todo: global variables to restore for *every* test + // @todo global variables to restore for *every* test array( 'wgLang', 'wgContLang', @@ -847,7 +847,7 @@ } // give up - // @todo: Inside a test, we could skip the test as incomplete. + // @todo Inside a test, we could skip the test as incomplete. // But frequently, this is used in fixture setup. throw new MWException( "No namespace defaults to wikitext!" ); } diff --git a/tests/phpunit/includes/LinksUpdateTest.php b/tests/phpunit/includes/LinksUpdateTest.php index ae551c0..4e6d3ea 100644 --- a/tests/phpunit/includes/LinksUpdateTest.php +++ b/tests/phpunit/includes/LinksUpdateTest.php @@ -147,7 +147,7 @@ ) ); } - #@todo: test recursive, too! + // @todo test recursive, too! protected function assertLinksUpdate( Title $title, ParserOutput $parserOutput, $table, $fields, $condition, array $expectedRows ) { $update = new LinksUpdate( $title, $parserOutput ); diff --git a/tests/phpunit/includes/RecentChangeTest.php b/tests/phpunit/includes/RecentChangeTest.php index 56967de..8e476b31b 100644 --- a/tests/phpunit/includes/RecentChangeTest.php +++ b/tests/phpunit/includes/RecentChangeTest.php @@ -225,7 +225,7 @@ } /** - * @todo: Emulate these edits somehow and extract + * @todo Emulate these edits somehow and extract * raw edit summary from RecentChange object * -- */ diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php index 3b8e5cf..00b1f29 100644 --- a/tests/phpunit/includes/RevisionStorageTest.php +++ b/tests/phpunit/includes/RevisionStorageTest.php @@ -365,7 +365,7 @@ $page = $this->createPage( 'RevisionStorageTest_testIsCurrent', 'Lorem Ipsum', CONTENT_MODEL_WIKITEXT ); $rev1 = $page->getRevision(); - # @todo: find out if this should be true + # @todo find out if this should be true # $this->assertTrue( $rev1->isCurrent() ); $rev1x = Revision::newFromId( $rev1->getId() ); @@ -374,7 +374,7 @@ $page->doEditContent( ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ), 'second rev' ); $rev2 = $page->getRevision(); - # @todo: find out if this should be true + # @todo find out if this should be true # $this->assertTrue( $rev2->isCurrent() ); $rev1x = Revision::newFromId( $rev1->getId() ); diff --git a/tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php b/tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php index 968aaba..f35a05f 100644 --- a/tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php +++ b/tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php @@ -63,7 +63,7 @@ */ public function testGetContentFormat() { try { - //@todo: change this to test failure on using a non-standard (but supported) format + // @todo change this to test failure on using a non-standard (but supported) format // for a content model supported in the given location. As of 1.21, there are // no alternative formats for any of the standard content models that could be // used for this though. diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php index b8b0391..f0eb76f 100644 --- a/tests/phpunit/includes/TitlePermissionTest.php +++ b/tests/phpunit/includes/TitlePermissionTest.php @@ -233,7 +233,7 @@ if ( $this->isWikitextNS( NS_MAIN ) ) { //NOTE: some content models don't allow moving - //@todo: find a Wikitext namespace for testing + // @todo find a Wikitext namespace for testing $this->setTitle( NS_MAIN ); $this->setUser( 'anon' ); diff --git a/tests/phpunit/includes/WikiPageTest.php b/tests/phpunit/includes/WikiPageTest.php index f829509..bf8cd37 100644 --- a/tests/phpunit/includes/WikiPageTest.php +++ b/tests/phpunit/includes/WikiPageTest.php @@ -569,7 +569,7 @@ public static function provideGetParserOutput() { return array( array( CONTENT_MODEL_WIKITEXT, "hello ''world''\n", "<p>hello <i>world</i></p>" ), - // @todo: more...? + // @todo more...? ); } @@ -609,7 +609,7 @@ $opt = new ParserOptions(); $po = $page->getParserOutput( $opt, $page->getLatest() + 1234 ); - //@todo: would be neat to also test deleted revision + // @todo would be neat to also test deleted revision $this->assertFalse( $po, "getParserOutput() shall return false for non-existing revisions." ); } diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php b/tests/phpunit/includes/content/JavaScriptContentTest.php index 6632edd..5c1ff8f 100644 --- a/tests/phpunit/includes/content/JavaScriptContentTest.php +++ b/tests/phpunit/includes/content/JavaScriptContentTest.php @@ -137,7 +137,7 @@ } /** - * @todo: test needs database! + * @todo Test needs database! */ /* public function getRedirectChain() { @@ -147,7 +147,7 @@ */ /** - * @todo: test needs database! + * @todo Test needs database! */ /* public function getUltimateRedirectTarget() { diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php index 28c006c..c7138b7 100644 --- a/tests/phpunit/includes/content/TextContentTest.php +++ b/tests/phpunit/includes/content/TextContentTest.php @@ -162,7 +162,7 @@ } /** - * @todo: test needs database! Should be done by a test class in the Database group. + * @todo Test needs database! Should be done by a test class in the Database group. */ /* public function getRedirectChain() { @@ -172,7 +172,7 @@ */ /** - * @todo: test needs database! Should be done by a test class in the Database group. + * @todo Test needs database! Should be done by a test class in the Database group. */ /* public function getUltimateRedirectTarget() { diff --git a/tests/phpunit/includes/content/WikitextContentTest.php b/tests/phpunit/includes/content/WikitextContentTest.php index c9eecf7..37b01fd 100644 --- a/tests/phpunit/includes/content/WikitextContentTest.php +++ b/tests/phpunit/includes/content/WikitextContentTest.php @@ -240,7 +240,7 @@ } /** - * @todo: test needs database! Should be done by a test class in the Database group. + * @todo Test needs database! Should be done by a test class in the Database group. */ /* public function getRedirectChain() { @@ -250,7 +250,7 @@ */ /** - * @todo: test needs database! Should be done by a test class in the Database group. + * @todo Test needs database! Should be done by a test class in the Database group. */ /* public function getUltimateRedirectTarget() { @@ -380,7 +380,7 @@ CONTENT_MODEL_WIKITEXT, "hello [[world test 21344]]\n", array( 'LinksDeletionUpdate' => array() ) ), - // @todo: more...? + // @todo more...? ); } } diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php index b272d73..91ab33a 100644 --- a/tests/phpunit/includes/db/DatabaseSqliteTest.php +++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php @@ -233,7 +233,7 @@ /** * Runs upgrades of older databases and compares results with current schema - * @todo: currently only checks list of tables + * @todo Currently only checks list of tables */ public function testUpgrades() { global $IP, $wgVersion, $wgProfileToDatabase; diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php b/tests/phpunit/includes/filebackend/FileBackendTest.php index 529d8cb..013bbe2 100644 --- a/tests/phpunit/includes/filebackend/FileBackendTest.php +++ b/tests/phpunit/includes/filebackend/FileBackendTest.php @@ -1460,7 +1460,7 @@ } } - // @TODO: testSecure + // @todo testSecure public function testDoOperations() { $this->backend = $this->singleBackend; diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php index 787b431..7b3d0ea 100644 --- a/tests/phpunit/includes/jobqueue/JobQueueTest.php +++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php @@ -47,7 +47,9 @@ $this->$q->setTestingPrefix( 'unittests-' . wfRandomString( 32 ) ); } } catch ( MWException $e ) { - }; // unsupported? (@TODO: what if it was another error?) + // unsupported? + // @todo What if it was another error? + }; } } diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php index f41c71c..e0158a2 100644 --- a/tests/phpunit/includes/parser/NewParserTest.php +++ b/tests/phpunit/includes/parser/NewParserTest.php @@ -554,7 +554,7 @@ if ( !$this->isWikitextNS( NS_MAIN ) ) { // parser tests frequently assume that the main namespace contains wikitext. - // @todo: When setting up pages, force the content model. Only skip if + // @todo When setting up pages, force the content model. Only skip if // $wgtContentModelUseDB is false. $this->markTestSkipped( "Main namespace does not support wikitext," . "skipping parser test: $desc" ); diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php index 47c47f6..8957a2f 100644 --- a/tests/phpunit/includes/search/SearchEngineTest.php +++ b/tests/phpunit/includes/search/SearchEngineTest.php @@ -45,7 +45,7 @@ } if ( !$this->isWikitextNS( NS_MAIN ) ) { - //@todo: cover the case of non-wikitext content in the main namespace + // @todo cover the case of non-wikitext content in the main namespace return; } diff --git a/tests/phpunit/maintenance/backupTextPassTest.php b/tests/phpunit/maintenance/backupTextPassTest.php index 7fe48dd..653a114 100644 --- a/tests/phpunit/maintenance/backupTextPassTest.php +++ b/tests/phpunit/maintenance/backupTextPassTest.php @@ -63,7 +63,7 @@ // Page from non-default namespace if ( $ns === NS_TALK ) { - //@todo: work around this. + // @todo work around this. throw new MWException( "The default wikitext namespace is the talk namespace. " . " We can't currently deal with that." ); } diff --git a/tests/phpunit/maintenance/backup_PageTest.php b/tests/phpunit/maintenance/backup_PageTest.php index 535e61e..99bd270 100644 --- a/tests/phpunit/maintenance/backup_PageTest.php +++ b/tests/phpunit/maintenance/backup_PageTest.php @@ -34,7 +34,7 @@ $this->talk_namespace = NS_TALK; if ( $this->namespace === $this->talk_namespace ) { - //@todo: work around this. + // @todo work around this. throw new MWException( "The default wikitext namespace is the talk namespace. " . " We can't currently deal with that." ); } diff --git a/thumb.php b/thumb.php index 04ba29c..4a0c9fb 100644 --- a/thumb.php +++ b/thumb.php @@ -122,7 +122,7 @@ $img = new UnregisteredLocalFile( null, $repo, # Temp files are hashed based on the name without the timestamp. # The thumbnails will be hashed based on the entire name however. - # @TODO: fix this convention to actually be reasonable. + # @todo fix this convention to actually be reasonable. $repo->getZonePath( 'public' ) . '/' . $repo->getTempHashPath( $fileName ) . $fileName ); } elseif ( $isOld ) { -- To view, visit https://gerrit.wikimedia.org/r/63816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70c6a69344ddebc603e9a1c1d87e3cc4f4f4c560 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: IAlex <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
