Merge "Fix typos in comments (A-B)"

14 files changed, 18 insertions, 18 deletions

diff --git a/includes/api/ApiCSPReport.php b/includes/api/ApiCSPReport.php
index 71dcdcfa1b54..51adf80b8388 100644
--- a/includes/api/ApiCSPReport.php
+++ b/includes/api/ApiCSPReport.php
@@ -290,7 +290,7 @@ class ApiCSPReport extends ApiBase {
 	}
 
 	/**
-	 * Doesn't touch db, so max lag should be rather irrelavent.
+	 * Doesn't touch db, so max lag should be rather irrelevant.
 	 *
 	 * Also, this makes sure that reports aren't lost during lag events.
 	 * @return bool
diff --git a/includes/api/ApiMergeHistory.php b/includes/api/ApiMergeHistory.php
index 78fe3f6c6139..33f06dff77b6 100644
--- a/includes/api/ApiMergeHistory.php
+++ b/includes/api/ApiMergeHistory.php
@@ -54,7 +54,7 @@ class ApiMergeHistory extends ApiBase {
 		$this->requireOnlyOneParameter( $params, 'from', 'fromid' );
 		$this->requireOnlyOneParameter( $params, 'to', 'toid' );
 
-		// Get page objects (nonexistant pages get caught in MergeHistory::isValidMerge())
+		// Get page objects (nonexistent pages get caught in MergeHistory::isValidMerge())
 		if ( isset( $params['from'] ) ) {
 			$fromTitle = Title::newFromText( $params['from'] );
 			if ( !$fromTitle || $fromTitle->isExternal() ) {
diff --git a/includes/api/Validator/ApiParamValidator.php b/includes/api/Validator/ApiParamValidator.php
index 09bc4a1e536e..3be00864b157 100644
--- a/includes/api/Validator/ApiParamValidator.php
+++ b/includes/api/Validator/ApiParamValidator.php
@@ -363,7 +363,7 @@ class ApiParamValidator {
 	}
 
 	/**
-	 * Valiate a parameter value using a settings array
+	 * Validate a parameter value using a settings array
 	 *
 	 * @param ApiBase $module
 	 * @param string $name Parameter name, unprefixed
diff --git a/includes/block/BlockManager.php b/includes/block/BlockManager.php
index 0d434e7039a1..b5728a908abd 100644
--- a/includes/block/BlockManager.php
+++ b/includes/block/BlockManager.php
@@ -381,7 +381,7 @@ class BlockManager {
 	 *
 	 * @param DatabaseBlock $block
 	 * @param bool $isAnon The user is logged out
-	 * @return bool The block sould be applied
+	 * @return bool The block should be applied
 	 */
 	private function shouldApplyCookieBlock( DatabaseBlock $block, $isAnon ) {
 		if ( !$block->isExpired() ) {
@@ -603,7 +603,7 @@ class BlockManager {
 	 *
 	 * @param AbstractBlock $block
 	 * @param bool $isAnon The user is logged out
-	 * @return bool The block sould be tracked with a cookie
+	 * @return bool The block should be tracked with a cookie
 	 */
 	private function shouldTrackBlockWithCookie( AbstractBlock $block, $isAnon ) {
 		if ( $block instanceof DatabaseBlock ) {
diff --git a/includes/block/BlockUser.php b/includes/block/BlockUser.php
index cf7a4f1a1b6c..9441d043db96 100644
--- a/includes/block/BlockUser.php
+++ b/includes/block/BlockUser.php
@@ -136,7 +136,7 @@ class BlockUser {
 	 * @var bool|null
 	 *
 	 * This may be null when an invalid option was passed to the constructor.
-	 * Such a case is catched in placeBlockUnsafe.
+	 * Such a case is caught in placeBlockUnsafe.
 	 */
 	private $isUserTalkEditBlocked = null;
 
@@ -191,13 +191,13 @@ class BlockUser {
 	 * @param string $reason Reason of the block
 	 * @param bool[] $blockOptions
 	 *    Valid options:
-	 *    - isCreateAccountBlocked      : Are acount creations prevented?
+	 *    - isCreateAccountBlocked      : Are account creations prevented?
 	 *    - isEmailBlocked              : Is emailing other users prevented?
 	 *    - isHardBlock                 : Are registered users prevented from editing?
 	 *    - isAutoblocking              : Should this block spread to others to
 	 *                                    limit block evasion?
 	 *    - isUserTalkEditBlocked       : Is editing blocked user's own talkpage allowed?
-	 *    - isHideUser                  : Should blocked user's name be hiden (needs hideuser)?
+	 *    - isHideUser                  : Should blocked user's name be hidden (needs hideuser)?
 	 *    - isPartial                   : Is this block partial? This is ignored when
 	 *                                    blockRestrictions is not an empty array.
 	 * @param array $blockRestrictions
diff --git a/includes/block/Restriction/AbstractRestriction.php b/includes/block/Restriction/AbstractRestriction.php
index 0c6de70629bf..07638d97c58a 100644
--- a/includes/block/Restriction/AbstractRestriction.php
+++ b/includes/block/Restriction/AbstractRestriction.php
@@ -25,13 +25,13 @@ namespace MediaWiki\Block\Restriction;
 abstract class AbstractRestriction implements Restriction {
 
 	/**
-	 * String constant identifying the type of restriction. Expected to be overriden in subclasses
+	 * String constant identifying the type of restriction. Expected to be overridden in subclasses
 	 * with a non-empty string value.
 	 */
 	public const TYPE = '';
 
 	/**
-	 * Numeric type identifier. Expected to be overriden in subclasses with a non-zero integer
+	 * Numeric type identifier. Expected to be overridden in subclasses with a non-zero integer
 	 * number. Must not exceed 127 to fit into a TINYINT database field.
 	 */
 	public const TYPE_ID = 0;
diff --git a/includes/content/AbstractContent.php b/includes/content/AbstractContent.php
index 9c153a828984..f0a76e3b8c18 100644
--- a/includes/content/AbstractContent.php
+++ b/includes/content/AbstractContent.php
@@ -205,7 +205,7 @@ abstract class AbstractContent implements Content {
 	 * Two Content objects MUST not be considered equal if they do not share the same content model.
 	 * Two Content objects that are equal SHOULD have the same serialization.
 	 *
-	 * This default implementation relies on equalsInternal() to determin whether the
+	 * This default implementation relies on equalsInternal() to determine whether the
 	 * Content objects are logically equivalent. Subclasses that need to implement a custom
 	 * equality check should consider overriding equalsInternal(). Subclasses that override
 	 * equals() itself MUST make sure that the implementation returns false for $that === null,
diff --git a/includes/editpage/Constraint/AutoSummaryMissingSummaryConstraint.php b/includes/editpage/Constraint/AutoSummaryMissingSummaryConstraint.php
index 851c62a8d424..c51b9e6336bd 100644
--- a/includes/editpage/Constraint/AutoSummaryMissingSummaryConstraint.php
+++ b/includes/editpage/Constraint/AutoSummaryMissingSummaryConstraint.php
@@ -29,7 +29,7 @@ use StatusValue;
  *   - the content has changed (to allow null edits without a summary, see T7365),
  *   - the new content is not a redirect (since redirecting a page has an informative automatic
  *       edit summary, see T9889), and
- *   - the user has not explicitely chosen to allow the automatic summary to be used
+ *   - the user has not explicitly chosen to allow the automatic summary to be used
  *
  * For most edits, the automatic summary is blank, so checking against the automatic summary means
  * checking that any summary was given.
diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index 5c50dbb7cbf0..d958568c114c 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -264,7 +264,7 @@ abstract class BagOStuff implements
 	 * 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/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php
index c4bfeefc9be8..7957fec3ff80 100644
--- a/includes/media/BitmapMetadataHandler.php
+++ b/includes/media/BitmapMetadataHandler.php
@@ -118,7 +118,7 @@ class BitmapMetadataHandler {
 
 	/**
 	 * Merge together the various types of metadata
-	 * the different types have different priorites,
+	 * the different types have different priorities,
 	 * and are merged in order.
 	 *
 	 * This function is generally called by the media handlers' getMetadata()
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 643e4afae0fe..af6a1eb47752 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1168,7 +1168,7 @@ class Article implements Page {
 			__METHOD__
 		);
 
-		// New page patrol: Get the timestamp of the oldest revison which
+		// New page patrol: Get the timestamp of the oldest revision which
 		// the revision table holds for the given page. Then we look
 		// whether it's within the RC lifespan and if it is, we try
 		// to get the recentchanges row belonging to that entry
diff --git a/includes/password/Argon2Password.php b/includes/password/Argon2Password.php
index 4d50c0f8207c..12da31f6fe24 100644
--- a/includes/password/Argon2Password.php
+++ b/includes/password/Argon2Password.php
@@ -45,7 +45,7 @@ class Argon2Password extends Password {
 	}
 
 	/**
-	 * @return mixed[] Array of 2nd and third parmeters to password_hash()
+	 * @return mixed[] Array of 2nd and third parameters to password_hash()
 	 */
 	private function prepareParams(): array {
 		switch ( $this->config['algo'] ) {
diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php
index 2e2aac0a9693..82b31df41cac 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -791,7 +791,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
 	}
 
 	/**
-	 * Apply defaults to a form descriptor, without creating non-existend fields.
+	 * Apply defaults to a form descriptor, without creating non-existent fields.
 	 *
 	 * Overrides $formDescriptor fields with their $defaultFormDescriptor equivalent, but
 	 * only if the field is defined in $fieldInfo, uses the special 'basefield' property to
diff --git a/includes/utils/BatchRowIterator.php b/includes/utils/BatchRowIterator.php
index 4ed3c572bcd6..c329a4d224b5 100644
--- a/includes/utils/BatchRowIterator.php
+++ b/includes/utils/BatchRowIterator.php
@@ -198,7 +198,7 @@ class BatchRowIterator implements RecursiveIterator {
 	}
 
 	/**
-	 * Reset the iterator to the begining of the table.
+	 * Reset the iterator to the beginning of the table.
 	 */
 	public function rewind() {
 		$this->key = -1; // self::next() will turn this into 0