diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 7ceba98c2e0..3236aa83e3a 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -1052,7 +1052,7 @@ class MediaWiki { in_array( http_response_code(), [ 200, 404 ], true ) && // The queue of (post-send) deferred updates is non-empty DeferredUpdates::pendingUpdatesCount() && - // Any buffered output is not spread out accross multiple output buffers + // Any buffered output is not spread out across multiple output buffers ob_get_level() <= 1 && // It is not too late to set additional HTTP headers !headers_sent() diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php index d8bbf554ef1..8b2f83be5ae 100644 --- a/includes/MediaWikiServices.php +++ b/includes/MediaWikiServices.php @@ -1200,7 +1200,7 @@ class MediaWikiServices extends ServiceContainer { /** * Returns the main WAN cache, yielding EmptyBagOStuff if there is none * - * The cache should relay any purge operations to all datacenterss + * The cache should relay any purge operations to all datacenters * * @since 1.28 * @return WANObjectCache diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php index 8fd1bf85de9..9ca2ce29e32 100644 --- a/includes/MergeHistory.php +++ b/includes/MergeHistory.php @@ -496,7 +496,7 @@ class MergeHistory { // revisions are now tied to a different title and its content model // does not support redirects, so we cannot leave a new revision on it. // This deletion does not depend on userright but may still fails. If it - // fails, it will be communicated in the status reponse. + // fails, it will be communicated in the status response. $reason = wfMessage( 'mergehistory-source-deleted-reason' )->inContentLanguage()->plain(); $deletionStatus = $newPage->doDeleteArticleReal( $reason, $user ); // Notify callers that the source page has been deleted. diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php index 92befb8cbf3..481ad724ce3 100644 --- a/includes/cache/MessageCache.php +++ b/includes/cache/MessageCache.php @@ -617,7 +617,7 @@ class MessageCache implements LoggerAwareInterface { private function isLanguageLoaded( $lang ) { // It is important that this only returns true if the cache was fully // populated by load(), so that callers can assume all cache keys exist. - // It is possible for $this->cache to be only patially populated through + // It is possible for $this->cache to be only partially populated through // methods like MessageCache::replace(), which must not make this method // return true (T208897). And this method must cease to return true // if the language was evicted by MapCacheLRU (T230690). diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php index f825b537300..47bbaf9f1ff 100644 --- a/includes/exception/MWException.php +++ b/includes/exception/MWException.php @@ -195,7 +195,7 @@ class MWException extends Exception { self::header( 'Content-Type: text/html; charset=utf-8' ); echo "\n" . '' . - // Mimick OutputPage::setPageTitle behaviour + // Mimic OutputPage::setPageTitle behaviour '' . htmlspecialchars( $this->msg( 'pagetitle', "$1 - $wgSitename", $this->getPageTitle() ) ) . '' . diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php index 363035acc75..9b8b64708ac 100644 --- a/includes/exception/MWExceptionHandler.php +++ b/includes/exception/MWExceptionHandler.php @@ -135,7 +135,7 @@ class MWExceptionHandler { try { $services->getDBLoadBalancerFactory()->rollbackPrimaryChanges( __METHOD__ ); } catch ( DBError $e2 ) { - // If the DB is unreacheable, rollback() will throw an error + // If the DB is unreachable, rollback() will throw an error // and the error report() method might need messages from the DB, // which would result in an exception loop. PHP may escalate such // errors to "Exception thrown without a stack frame" fatals, but @@ -444,7 +444,7 @@ TXT; * * @since 1.26 * @param array $trace Stacktrace - * @return array Stacktrace with arugment values converted to data types + * @return array Stacktrace with argument values converted to data types */ public static function redactTrace( array $trace ) { return array_map( static function ( $frame ) { @@ -603,7 +603,7 @@ TXT; if ( $e instanceof ErrorException && ( error_reporting() & $e->getSeverity() ) === 0 ) { - // Flag surpressed errors + // Flag suppressed errors $data['suppressed'] = true; } @@ -750,7 +750,7 @@ TXT; ); } - // Include all errors in the json log (surpressed errors will be flagged) + // Include all errors in the json log (suppressed errors will be flagged) $json = self::jsonSerializeException( $e, false, FormatJson::ALL_OK, $catcher ); if ( $json !== false ) { $logger = LoggerFactory::getInstance( "{$channel}-json" ); @@ -758,7 +758,7 @@ TXT; // and emits messages even if wikimedia/at-ease was used to suppress the // error. To avoid clobbering Logstash dashboards with these, make sure // those have their level casted to DEBUG so that they are excluded by - // level-based filteres automatically instead of requiring a dedicated filter + // level-based filters automatically instead of requiring a dedicated filter // for this channel. To be improved: T193472. $unfilteredLevel = $suppressed ? LogLevel::DEBUG : $level; $logger->log( $unfilteredLevel, $json, [ 'private' => true ] ); diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php index 46eccbc7768..b4dc49d883e 100644 --- a/includes/exception/MWExceptionRenderer.php +++ b/includes/exception/MWExceptionRenderer.php @@ -161,7 +161,7 @@ class MWExceptionRenderer { $pageTitle = self::msg( 'internalerror', 'Internal error' ); echo "\n" . '' . - // Mimick OutputPage::setPageTitle behaviour + // Mimic OutputPage::setPageTitle behaviour '' . htmlspecialchars( self::msg( 'pagetitle', "$1 - $wgSitename", $pageTitle ) ) . '' . diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index bccd73f0e81..0e2c5113312 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -538,7 +538,7 @@ class MysqlInstaller extends DatabaseInstaller { $grantableNames[] = $fullName; break; } else { - // If we couldn't create for some bizzare reason and the + // If we couldn't create for some bizarre reason and the // user probably doesn't exist, skip the grant $this->db->rollback( __METHOD__ ); $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getMessage() ); diff --git a/includes/language/Message.php b/includes/language/Message.php index 1c4c997051e..7a10f62c637 100644 --- a/includes/language/Message.php +++ b/includes/language/Message.php @@ -1280,7 +1280,7 @@ class Message implements MessageSpecifier, Serializable { // A temporary marker for $1 parameters that is only valid // in non-attribute contexts. However if the entire message is escaped // then we don't want to use it because it will be mangled in all contexts - // and its unnessary as ->escaped() messages aren't html. + // and its unnecessary as ->escaped() messages aren't html. $marker = $format === self::FORMAT_ESCAPED ? '$' : '$\'"'; $replacementKeys = []; foreach ( $this->parameters as $n => $param ) { diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php index 0dbf0ac8399..64f99a6a758 100644 --- a/includes/libs/mime/MimeAnalyzer.php +++ b/includes/libs/mime/MimeAnalyzer.php @@ -916,7 +916,7 @@ class MimeAnalyzer implements LoggerAwareInterface { /** * Internal MIME type detection. Detection is done using the fileinfo - * extension if it is available. It can be overriden by callback, which could + * extension if it is available. It can be overridden by callback, which could * use an external program, for example. If detection fails and $ext is not false, * the MIME type is guessed from the file extension, using getMimeTypeFromExtensionOrNull. * diff --git a/includes/libs/objectcache/MediumSpecificBagOStuff.php b/includes/libs/objectcache/MediumSpecificBagOStuff.php index 54c4bbaab4b..93a41b798e9 100644 --- a/includes/libs/objectcache/MediumSpecificBagOStuff.php +++ b/includes/libs/objectcache/MediumSpecificBagOStuff.php @@ -256,7 +256,7 @@ abstract class MediumSpecificBagOStuff extends BagOStuff { * The callback function returns the new value given the current value * (which will be false if not present), and takes the arguments: * (this BagOStuff, cache key, current value, TTL). - * The TTL parameter is reference set to $exptime. It can be overriden in the callback. + * The TTL parameter is reference set to $exptime. It can be overridden in the callback. * Nothing is stored nor deleted if the callback returns false. * * @param string $key diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php b/includes/libs/objectcache/MultiWriteBagOStuff.php index 93f349f6930..6f08e4d3290 100644 --- a/includes/libs/objectcache/MultiWriteBagOStuff.php +++ b/includes/libs/objectcache/MultiWriteBagOStuff.php @@ -82,7 +82,7 @@ class MultiWriteBagOStuff extends BagOStuff { } else { if ( !isset( $cacheInfo['args'] ) ) { // B/C for when $cacheInfo was for ObjectCache::newFromParams(). - // Callers intenting this to be for ObjectFactory::getObjectFromSpec + // Callers intending this to be for ObjectFactory::getObjectFromSpec // should have set "args" per the docs above. Doings so avoids extra // (likely harmless) params (factory/class/calls) ending up in "args". $cacheInfo['args'] = [ $cacheInfo ]; diff --git a/includes/libs/objectcache/utils/MemcachedClient.php b/includes/libs/objectcache/utils/MemcachedClient.php index 96f43fdfeaf..3caedf68373 100644 --- a/includes/libs/objectcache/utils/MemcachedClient.php +++ b/includes/libs/objectcache/utils/MemcachedClient.php @@ -610,7 +610,7 @@ class MemcachedClient { * @param int $exp (optional) Expiration time. This can be a number of seconds * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or * longer must be the timestamp of the time at which the mapping should expire. It - * is safe to use timestamps in all cases, regardless of exipration + * is safe to use timestamps in all cases, regardless of expiration * eg: strtotime("+3 hour") * * @return bool @@ -666,7 +666,7 @@ class MemcachedClient { * @param int $exp (optional) Expiration time. This can be a number of seconds * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or * longer must be the timestamp of the time at which the mapping should expire. It - * is safe to use timestamps in all cases, regardless of exipration + * is safe to use timestamps in all cases, regardless of expiration * eg: strtotime("+3 hour") * * @return bool True on success @@ -688,7 +688,7 @@ class MemcachedClient { * @param int $exp (optional) Expiration time. This can be a number of seconds * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or * longer must be the timestamp of the time at which the mapping should expire. It - * is safe to use timestamps in all cases, regardless of exipration + * is safe to use timestamps in all cases, regardless of expiration * eg: strtotime("+3 hour") * * @return bool True on success @@ -911,7 +911,7 @@ class MemcachedClient { // {{{ _incrdecr() /** - * Perform increment/decriment on $key + * Perform increment/decrement on $key * * @param string $cmd Command to perform * @param string|array $key Key to perform it on @@ -1046,7 +1046,7 @@ class MemcachedClient { * @param int $exp (optional) Expiration time. This can be a number of seconds * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or * longer must be the timestamp of the time at which the mapping should expire. It - * is safe to use timestamps in all cases, regardless of exipration + * is safe to use timestamps in all cases, regardless of expiration * eg: strtotime("+3 hour") * @param float $casToken [optional] * diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php index 39b6e9f4a14..a1b4e1a91b0 100644 --- a/includes/media/MediaHandler.php +++ b/includes/media/MediaHandler.php @@ -816,7 +816,7 @@ abstract class MediaHandler { } /** - * Long description. Shown under image on image description page surounded by (). + * Long description. Shown under image on image description page surrounded by (). * * @stable to override * diff --git a/includes/utils/MWCryptHKDF.php b/includes/utils/MWCryptHKDF.php index d0fe6ccca44..9952fabdea6 100644 --- a/includes/utils/MWCryptHKDF.php +++ b/includes/utils/MWCryptHKDF.php @@ -1,6 +1,6 @@