aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorUmherirrender <umherirrender_de.wp@web.de>2017-08-11 16:49:52 +0200
committerUmherirrender <umherirrender_de.wp@web.de>2017-08-11 16:49:52 +0200
commitbf61a7743194c6b3add03fa4f0413d5cc21e40b8 (patch)
tree5cedeb62dc5fd58acaa4f0d504ac82a8e2660461 /includes
parent4112201ef517998de9b29887c306b6c43e6376d3 (diff)
downloadmediawikicore-bf61a7743194c6b3add03fa4f0413d5cc21e40b8.tar.gz
mediawikicore-bf61a7743194c6b3add03fa4f0413d5cc21e40b8.zip
Change @inheritdoc to @inheritDoc
Only @inheritDoc works for the Sniff MediaWiki.Commenting.FunctionComment Change-Id: I91fc02cda6701d790e4334fc2bc47f230955545c
Diffstat (limited to 'includes')
-rw-r--r--includes/api/ApiUsageException.php6
-rw-r--r--includes/auth/AbstractAuthenticationProvider.php2
-rw-r--r--includes/auth/AbstractPrimaryAuthenticationProvider.php4
-rw-r--r--includes/auth/AbstractSecondaryAuthenticationProvider.php2
-rw-r--r--includes/auth/PrimaryAuthenticationProvider.php2
-rw-r--r--includes/changes/ChangesListBooleanFilter.php8
-rw-r--r--includes/changes/ChangesListBooleanFilterGroup.php4
-rw-r--r--includes/changes/ChangesListStringOptionsFilter.php4
-rw-r--r--includes/changes/ChangesListStringOptionsFilterGroup.php6
-rw-r--r--includes/debug/logger/monolog/BufferHandler.php2
-rw-r--r--includes/debug/logger/monolog/KafkaHandler.php4
-rw-r--r--includes/debug/logger/monolog/LineFormatter.php2
-rw-r--r--includes/diff/WordLevelDiff.php2
-rw-r--r--includes/libs/rdbms/exception/DBExpectedError.php2
-rw-r--r--includes/libs/stats/SamplingStatsdClient.php4
-rw-r--r--includes/media/Jpeg.php2
-rw-r--r--includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php6
-rw-r--r--includes/search/NullIndexField.php2
-rw-r--r--includes/search/SearchIndexFieldDefinition.php2
-rw-r--r--includes/specials/SpecialRecentchanges.php8
-rw-r--r--includes/specials/SpecialRecentchangeslinked.php2
-rw-r--r--includes/specials/SpecialWatchlist.php8
-rw-r--r--includes/upload/UploadFromChunks.php8
23 files changed, 46 insertions, 46 deletions
diff --git a/includes/api/ApiUsageException.php b/includes/api/ApiUsageException.php
index fb49e2dbe2b1..17655ec1c3de 100644
--- a/includes/api/ApiUsageException.php
+++ b/includes/api/ApiUsageException.php
@@ -186,7 +186,7 @@ class ApiUsageException extends UsageException implements ILocalizedException {
/**
* @deprecated Do not use. This only exists here because UsageException is in
* the inheritance chain for backwards compatibility.
- * @inheritdoc
+ * @inheritDoc
*/
public function getCodeString() {
wfDeprecated( __METHOD__, '1.29' );
@@ -196,7 +196,7 @@ class ApiUsageException extends UsageException implements ILocalizedException {
/**
* @deprecated Do not use. This only exists here because UsageException is in
* the inheritance chain for backwards compatibility.
- * @inheritdoc
+ * @inheritDoc
*/
public function getMessageArray() {
wfDeprecated( __METHOD__, '1.29' );
@@ -210,7 +210,7 @@ class ApiUsageException extends UsageException implements ILocalizedException {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function getMessageObject() {
return $this->status->getMessage();
diff --git a/includes/auth/AbstractAuthenticationProvider.php b/includes/auth/AbstractAuthenticationProvider.php
index 9e38eccb3ffa..58cec118c8dc 100644
--- a/includes/auth/AbstractAuthenticationProvider.php
+++ b/includes/auth/AbstractAuthenticationProvider.php
@@ -50,7 +50,7 @@ abstract class AbstractAuthenticationProvider implements AuthenticationProvider
}
/**
- * @inheritdoc
+ * @inheritDoc
* @note Override this if it makes sense to support more than one instance
*/
public function getUniqueId() {
diff --git a/includes/auth/AbstractPrimaryAuthenticationProvider.php b/includes/auth/AbstractPrimaryAuthenticationProvider.php
index ea3dfa3bd6db..ca947b61a80a 100644
--- a/includes/auth/AbstractPrimaryAuthenticationProvider.php
+++ b/includes/auth/AbstractPrimaryAuthenticationProvider.php
@@ -46,7 +46,7 @@ abstract class AbstractPrimaryAuthenticationProvider extends AbstractAuthenticat
}
/**
- * @inheritdoc
+ * @inheritDoc
* @note Reimplement this if you do anything other than
* User::getCanonicalName( $req->username ) to determine the user being
* authenticated.
@@ -57,7 +57,7 @@ abstract class AbstractPrimaryAuthenticationProvider extends AbstractAuthenticat
}
/**
- * @inheritdoc
+ * @inheritDoc
* @note Reimplement this if self::getAuthenticationRequests( AuthManager::ACTION_REMOVE )
* doesn't return requests that will revoke all access for the user.
*/
diff --git a/includes/auth/AbstractSecondaryAuthenticationProvider.php b/includes/auth/AbstractSecondaryAuthenticationProvider.php
index 00493bc7a43e..4a2accafcb56 100644
--- a/includes/auth/AbstractSecondaryAuthenticationProvider.php
+++ b/includes/auth/AbstractSecondaryAuthenticationProvider.php
@@ -43,7 +43,7 @@ abstract class AbstractSecondaryAuthenticationProvider extends AbstractAuthentic
}
/**
- * @inheritdoc
+ * @inheritDoc
* @note Reimplement this if self::getAuthenticationRequests( AuthManager::ACTION_REMOVE )
* doesn't return requests that will revoke all access for the user.
*/
diff --git a/includes/auth/PrimaryAuthenticationProvider.php b/includes/auth/PrimaryAuthenticationProvider.php
index 4033613f752b..5d82f8995c9f 100644
--- a/includes/auth/PrimaryAuthenticationProvider.php
+++ b/includes/auth/PrimaryAuthenticationProvider.php
@@ -81,7 +81,7 @@ interface PrimaryAuthenticationProvider extends AuthenticationProvider {
const TYPE_NONE = 'none';
/**
- * {@inheritdoc}
+ * @inheritDoc
*
* Of the requests returned by this method, exactly one should have
* {@link AuthenticationRequest::$required} set to REQUIRED.
diff --git a/includes/changes/ChangesListBooleanFilter.php b/includes/changes/ChangesListBooleanFilter.php
index 930269cab687..01e67f5079b2 100644
--- a/includes/changes/ChangesListBooleanFilter.php
+++ b/includes/changes/ChangesListBooleanFilter.php
@@ -157,14 +157,14 @@ class ChangesListBooleanFilter extends ChangesListFilter {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function displaysOnUnstructuredUi() {
return !!$this->showHide;
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function isFeatureAvailableOnStructuredUi() {
return $this->isReplacedInStructuredUi ||
@@ -206,7 +206,7 @@ class ChangesListBooleanFilter extends ChangesListFilter {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function getJsData() {
$output = parent::getJsData();
@@ -217,7 +217,7 @@ class ChangesListBooleanFilter extends ChangesListFilter {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function isSelected( FormOptions $opts ) {
return !$opts[ $this->getName() ] &&
diff --git a/includes/changes/ChangesListBooleanFilterGroup.php b/includes/changes/ChangesListBooleanFilterGroup.php
index 951c4077c2a0..0622211f0ab4 100644
--- a/includes/changes/ChangesListBooleanFilterGroup.php
+++ b/includes/changes/ChangesListBooleanFilterGroup.php
@@ -43,7 +43,7 @@ class ChangesListBooleanFilterGroup extends ChangesListFilterGroup {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function createFilter( array $filterDefinition ) {
return new ChangesListBooleanFilter( $filterDefinition );
@@ -59,7 +59,7 @@ class ChangesListBooleanFilterGroup extends ChangesListFilterGroup {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function isPerGroupRequestParameter() {
return false;
diff --git a/includes/changes/ChangesListStringOptionsFilter.php b/includes/changes/ChangesListStringOptionsFilter.php
index 76d0bef15522..930ba128f64a 100644
--- a/includes/changes/ChangesListStringOptionsFilter.php
+++ b/includes/changes/ChangesListStringOptionsFilter.php
@@ -9,14 +9,14 @@
*/
class ChangesListStringOptionsFilter extends ChangesListFilter {
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function displaysOnUnstructuredUi() {
return false;
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function isSelected( FormOptions $opts ) {
$option = $opts[ $this->getGroup()->getName() ];
diff --git a/includes/changes/ChangesListStringOptionsFilterGroup.php b/includes/changes/ChangesListStringOptionsFilterGroup.php
index 487120d8a240..59efd82bcab8 100644
--- a/includes/changes/ChangesListStringOptionsFilterGroup.php
+++ b/includes/changes/ChangesListStringOptionsFilterGroup.php
@@ -129,7 +129,7 @@ class ChangesListStringOptionsFilterGroup extends ChangesListFilterGroup {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function isPerGroupRequestParameter() {
return true;
@@ -154,7 +154,7 @@ class ChangesListStringOptionsFilterGroup extends ChangesListFilterGroup {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function createFilter( array $filterDefinition ) {
return new ChangesListStringOptionsFilter( $filterDefinition );
@@ -232,7 +232,7 @@ class ChangesListStringOptionsFilterGroup extends ChangesListFilterGroup {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function getJsData() {
$output = parent::getJsData();
diff --git a/includes/debug/logger/monolog/BufferHandler.php b/includes/debug/logger/monolog/BufferHandler.php
index 331b718c18e6..650d01274b58 100644
--- a/includes/debug/logger/monolog/BufferHandler.php
+++ b/includes/debug/logger/monolog/BufferHandler.php
@@ -34,7 +34,7 @@ use Monolog\Handler\BufferHandler as BaseBufferHandler;
*/
class BufferHandler extends BaseBufferHandler {
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
public function handle( array $record ) {
if ( !$this->initialized ) {
diff --git a/includes/debug/logger/monolog/KafkaHandler.php b/includes/debug/logger/monolog/KafkaHandler.php
index 6670fe932d37..8e7113164a95 100644
--- a/includes/debug/logger/monolog/KafkaHandler.php
+++ b/includes/debug/logger/monolog/KafkaHandler.php
@@ -128,7 +128,7 @@ class KafkaHandler extends AbstractProcessingHandler {
}
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
protected function write( array $record ) {
if ( $record['formatted'] !== null ) {
@@ -138,7 +138,7 @@ class KafkaHandler extends AbstractProcessingHandler {
}
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
public function handleBatch( array $batch ) {
$channels = [];
diff --git a/includes/debug/logger/monolog/LineFormatter.php b/includes/debug/logger/monolog/LineFormatter.php
index 5a7ddb1ec58c..cdc4da3aa0b0 100644
--- a/includes/debug/logger/monolog/LineFormatter.php
+++ b/includes/debug/logger/monolog/LineFormatter.php
@@ -60,7 +60,7 @@ class LineFormatter extends MonologLineFormatter {
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function format( array $record ) {
// Drop the 'private' flag from the context
diff --git a/includes/diff/WordLevelDiff.php b/includes/diff/WordLevelDiff.php
index 9c9b1c9c576e..0b318bdb3979 100644
--- a/includes/diff/WordLevelDiff.php
+++ b/includes/diff/WordLevelDiff.php
@@ -33,7 +33,7 @@ use MediaWiki\Diff\WordAccumulator;
*/
class WordLevelDiff extends \Diff {
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected $bailoutComplexity = 40000000; // Roughly 6K x 6K words changed
diff --git a/includes/libs/rdbms/exception/DBExpectedError.php b/includes/libs/rdbms/exception/DBExpectedError.php
index f6b9bd5ebe7f..4f65efae02b6 100644
--- a/includes/libs/rdbms/exception/DBExpectedError.php
+++ b/includes/libs/rdbms/exception/DBExpectedError.php
@@ -50,7 +50,7 @@ class DBExpectedError extends DBError implements MessageSpecifier, ILocalizedExc
}
/**
- * @inheritdoc
+ * @inheritDoc
* @since 1.29
*/
public function getMessageObject() {
diff --git a/includes/libs/stats/SamplingStatsdClient.php b/includes/libs/stats/SamplingStatsdClient.php
index 526f12013d39..4db2b6072c73 100644
--- a/includes/libs/stats/SamplingStatsdClient.php
+++ b/includes/libs/stats/SamplingStatsdClient.php
@@ -47,7 +47,7 @@ class SamplingStatsdClient extends StatsdClient {
* Sets sampling rate for all items in $data.
* The sample rate specified in a StatsdData entity overrides the sample rate specified here.
*
- * {@inheritDoc}
+ * @inheritDoc
*/
public function appendSampleRate( $data, $sampleRate = 1 ) {
$samplingRates = $this->samplingRates;
@@ -147,7 +147,7 @@ class SamplingStatsdClient extends StatsdClient {
}
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
protected function throwException( Exception $exception ) {
if ( !$this->getFailSilently() ) {
diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 29f0d7c606d4..287c198c5709 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -175,7 +175,7 @@ class JpegHandler extends ExifBitmapHandler {
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
protected function transformImageMagick( $image, $params ) {
global $wgUseTinyRGBForJPGThumbnails;
diff --git a/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php b/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php
index 166f1babf16f..d16a4ff763a4 100644
--- a/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php
+++ b/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php
@@ -27,7 +27,7 @@
*/
class ResourceLoaderMediaWikiUtilModule extends ResourceLoaderFileModule {
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function getScript( ResourceLoaderContext $context ) {
return ResourceLoader::makeConfigSetScript(
@@ -38,14 +38,14 @@ class ResourceLoaderMediaWikiUtilModule extends ResourceLoaderFileModule {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function supportsURLLoading() {
return false;
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
public function enableModuleContentVersion() {
return true;
diff --git a/includes/search/NullIndexField.php b/includes/search/NullIndexField.php
index 852e1d5a1bf2..32f60bcc67e9 100644
--- a/includes/search/NullIndexField.php
+++ b/includes/search/NullIndexField.php
@@ -44,7 +44,7 @@ class NullIndexField implements SearchIndexField {
}
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
public function getEngineHints( SearchEngine $engine ) {
return [];
diff --git a/includes/search/SearchIndexFieldDefinition.php b/includes/search/SearchIndexFieldDefinition.php
index 87d6344bea42..9a637d85c27e 100644
--- a/includes/search/SearchIndexFieldDefinition.php
+++ b/includes/search/SearchIndexFieldDefinition.php
@@ -141,7 +141,7 @@ abstract class SearchIndexFieldDefinition implements SearchIndexField {
}
/**
- * {@inheritDoc}
+ * @inheritDoc
*/
public function getEngineHints( SearchEngine $engine ) {
return [];
diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 6ef75e07c0b1..41007e274aad 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -255,7 +255,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function transformFilterDefinition( array $filterDefinition ) {
if ( isset( $filterDefinition['showHideSuffix'] ) ) {
@@ -266,7 +266,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function registerFilters() {
parent::registerFilters();
@@ -380,7 +380,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function buildQuery( &$tables, &$fields, &$conds,
&$query_options, &$join_conds, FormOptions $opts
@@ -404,7 +404,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function doMainQuery( $tables, $fields, $conds, $query_options,
$join_conds, FormOptions $opts
diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index fee336e435e9..e353f0cbdd49 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -47,7 +47,7 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function doMainQuery( $tables, $select, $conds, $query_options,
$join_conds, FormOptions $opts
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 9e01d2d450b5..d23625a165cf 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -109,7 +109,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function transformFilterDefinition( array $filterDefinition ) {
if ( isset( $filterDefinition['showHideSuffix'] ) ) {
@@ -120,7 +120,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function registerFilters() {
parent::registerFilters();
@@ -250,7 +250,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function buildQuery( &$tables, &$fields, &$conds, &$query_options,
&$join_conds, FormOptions $opts
@@ -267,7 +267,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
}
/**
- * @inheritdoc
+ * @inheritDoc
*/
protected function doMainQuery( $tables, $fields, $conds, $query_options,
$join_conds, FormOptions $opts
diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index c0c2cb5c3196..68bcb9d9c746 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -64,7 +64,7 @@ class UploadFromChunks extends UploadFromFile {
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function tryStashFile( User $user, $isPartial = false ) {
try {
@@ -77,7 +77,7 @@ class UploadFromChunks extends UploadFromFile {
}
/**
- * {@inheritdoc}
+ * @inheritDoc
* @throws UploadChunkVerificationException
* @deprecated since 1.28 Use tryStashFile() instead
*/
@@ -88,7 +88,7 @@ class UploadFromChunks extends UploadFromFile {
}
/**
- * {@inheritdoc}
+ * @inheritDoc
* @throws UploadChunkVerificationException
* @deprecated since 1.28
*/
@@ -99,7 +99,7 @@ class UploadFromChunks extends UploadFromFile {
}
/**
- * {@inheritdoc}
+ * @inheritDoc
* @throws UploadChunkVerificationException
* @deprecated since 1.28
*/