Fix typos in comments (S)

Change-Id: Id86769ca81ff65707edde520585aa9ea117123e1

21 files changed, 27 insertions, 27 deletions

diff --git a/includes/Setup.php b/includes/Setup.php
index 777de04be9a8..e17e100422ca 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -87,7 +87,7 @@ if ( ini_get( 'mbstring.func_overload' ) ) {
 }
 
 // The MW_ENTRY_POINT constant must always exists, to make it safe to access.
-// For compat, we do support older and custom MW entryoints that don't set this,
+// For compat, we do support older and custom MW entrypoints that don't set this,
 // in which case we assign a default here.
 if ( !defined( 'MW_ENTRY_POINT' ) ) {
 	/**
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index f8a7b5f1a7ea..94dd3e3a0e9a 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -276,7 +276,7 @@ class SiteConfiguration {
 			}
 		}
 
-		// Type-safe string replacemens, don't do replacements on non-strings.
+		// Type-safe string replacements, don't do replacements on non-strings.
 		if ( is_string( $retval ) ) {
 			$retval = strtr( $retval, $params['replacements'] );
 		} elseif ( is_array( $retval ) ) {
@@ -611,7 +611,7 @@ class SiteConfiguration {
 					// It is important that we generally preserve numerical keys and only
 					// fallback to appending values if there are conflicts. This is needed
 					// by configuration variables that hold associative arrays with
-					// meaningul numerical keys, such as $wgNamespacesWithSubpages,
+					// meaningful numerical keys, such as $wgNamespacesWithSubpages,
 					// $wgNamespaceProtection, $wgNamespacesToBeSearchedDefault, etc.
 					$out[] = $value;
 				} elseif ( $out[$key] === false ) {
diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php
index f2f106ada558..7183f7683815 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -1164,7 +1164,7 @@ class SwiftFileBackend extends FileBackendStore {
 
 		// Send the requested additional headers
 		foreach ( $params['headers'] as $header ) {
-			header( $header ); // aways send
+			header( $header ); // always send
 		}
 
 		if ( empty( $params['allowOB'] ) ) {
diff --git a/includes/libs/lockmanager/ScopedLock.php b/includes/libs/lockmanager/ScopedLock.php
index 089a1a915909..419ac0c613ba 100644
--- a/includes/libs/lockmanager/ScopedLock.php
+++ b/includes/libs/lockmanager/ScopedLock.php
@@ -81,7 +81,7 @@ class ScopedLock {
 	}
 
 	/**
-	 * Release a scoped lock and set any errors in the attatched StatusValue object.
+	 * Release a scoped lock and set any errors in the attached StatusValue object.
 	 * This is useful for early release of locks before function scope is destroyed.
 	 * This is the same as setting the lock object to null.
 	 *
diff --git a/includes/libs/virtualrest/SwiftVirtualRESTService.php b/includes/libs/virtualrest/SwiftVirtualRESTService.php
index ff66c2437892..3fee91337756 100644
--- a/includes/libs/virtualrest/SwiftVirtualRESTService.php
+++ b/includes/libs/virtualrest/SwiftVirtualRESTService.php
@@ -158,7 +158,7 @@ class SwiftVirtualRESTService extends VirtualRESTService {
 			$result = [];
 			// This was an authentication request for work requests...
 			if ( $this->applyAuthResponse( $firstReq ) ) {
-				// If it succeeded, we can subsitute the work requests back.
+				// If it succeeded, we can substitute the work requests back.
 				// Call this recursively in order to munge and add headers.
 				$result = $this->onRequests( $firstReq['chain'], $idGeneratorFunc );
 			} else {
diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index 1c5e56b69e0d..13003eb62d38 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -750,7 +750,7 @@ class SqlBagOStuff extends MediumSpecificBagOStuff {
 	 *
 	 * If the current row for a key exists and has an integral UNIX timestamp of expiration
 	 * greater than that of the provided modification timestamp, then the write to that key
-	 * will be aborted with a "false" result. Aquisition of advisory key locks must be handled
+	 * will be aborted with a "false" result. Acquisition of advisory key locks must be handled
 	 * by calling functions.
 	 *
 	 * In multi-primary mode, if the current row for a key exists and has a modification token
@@ -814,7 +814,7 @@ class SqlBagOStuff extends MediumSpecificBagOStuff {
 	 *
 	 * If the current row for a key exists, has an integral UNIX timestamp of expiration greater
 	 * than that of the provided modification timestamp, and the CAS token does not match, then
-	 * the write to that key will be aborted with a "false" result. Aquisition of advisory key
+	 * the write to that key will be aborted with a "false" result. Acquisition of advisory key
 	 * locks must be handled by calling functions.
 	 *
 	 * In multi-primary mode, if the current row for a key exists and has a modification token
diff --git a/includes/search/Entity/SearchResultThumbnail.php b/includes/search/Entity/SearchResultThumbnail.php
index 82a30432bd2d..a2e0f6179e7a 100644
--- a/includes/search/Entity/SearchResultThumbnail.php
+++ b/includes/search/Entity/SearchResultThumbnail.php
@@ -44,7 +44,7 @@ class SearchResultThumbnail {
 	private $height;
 
 	/**
-	 * String that represent file indentity in storage or null
+	 * String that represent file identity in storage or null
 	 * @var string|null
 	 */
 	private $name;
@@ -127,7 +127,7 @@ class SearchResultThumbnail {
 	}
 
 	/**
-	 * String that represent file indentity in storage or null
+	 * String that represent file identity in storage or null
 	 * @return string|null
 	 */
 	public function getName(): ?string {
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 334f91396c34..b8781f3a5ecc 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -113,7 +113,7 @@ abstract class SearchEngine {
 	 * Perform a title search in the article archive.
 	 * NOTE: these results still should be filtered by
 	 * matching against PageArchive, permissions checks etc
-	 * The results returned by this methods are only sugegstions and
+	 * The results returned by this methods are only suggestions and
 	 * may not end up being shown to the user.
 	 *
 	 * @note As of 1.32 overriding this function is deprecated. It will
diff --git a/includes/search/SearchHighlighter.php b/includes/search/SearchHighlighter.php
index ab4aa9bfb7bc..aefad9813e39 100644
--- a/includes/search/SearchHighlighter.php
+++ b/includes/search/SearchHighlighter.php
@@ -69,7 +69,7 @@ class SearchHighlighter {
 			return '';
 		}
 
-		// spli text into text + templates/links/tables
+		// split text into text + templates/links/tables
 		$spat = "/(\\{\\{)|(\\[\\[[^\\]:]+:)|(\n\\{\\|)";
 		// first capture group is for detecting nested templates/links/tables/references
 		$endPatterns = [
@@ -283,7 +283,7 @@ class SearchHighlighter {
 			} elseif ( $last + 1 == $index
 				&& $offsets[$last] + strlen( $snippets[$last] ) >= strlen( $all[$last] )
 			) {
-				$extract .= " " . $line; // continous lines
+				$extract .= " " . $line; // continuous lines
 			} else {
 				$extract .= '<b> ... </b>' . $line;
 			}
diff --git a/includes/session/SessionProvider.php b/includes/session/SessionProvider.php
index 1890ea2c5852..25b6bcb42696 100644
--- a/includes/session/SessionProvider.php
+++ b/includes/session/SessionProvider.php
@@ -456,7 +456,7 @@ abstract class SessionProvider implements SessionProviderInterface {
 	 * and/or ID may be persisted, and should be used to construct an
 	 * unverified UserInfo to pass to SessionInfo::__construct().
 	 *
-	 * A backend that cannot persist sesison ID or user info should implement
+	 * A backend that cannot persist session ID or user info should implement
 	 * this as a no-op.
 	 *
 	 * @note For use by \MediaWiki\Session\SessionBackend only
@@ -470,7 +470,7 @@ abstract class SessionProvider implements SessionProviderInterface {
 	 *
 	 * For example, blank and expire any cookies set by self::persistSession().
 	 *
-	 * A backend that cannot persist sesison ID or user info should implement
+	 * A backend that cannot persist session ID or user info should implement
 	 * this as a no-op.
 	 *
 	 * @note For use by \MediaWiki\Session\SessionManager only
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index f8a7f59745f2..1db67a6ef79e 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -127,7 +127,7 @@ abstract class Skin extends ContextSource {
 	 * template data.
 	 *
 	 * The data keys should be valid English words. Compound words should
-	 * be hypenated except if they are normally written as one word. Each
+	 * be hyphenated except if they are normally written as one word. Each
 	 * key should be prefixed with a type hint, this may be enforced by the
 	 * class PHPUnit test.
 	 *
diff --git a/includes/skins/SkinApi.php b/includes/skins/SkinApi.php
index 6f970c521292..8305a3e2c617 100644
--- a/includes/skins/SkinApi.php
+++ b/includes/skins/SkinApi.php
@@ -33,6 +33,6 @@ class SkinApi extends SkinMustache {
 	/**
 	 * Extension of class methods is discouraged.
 	 * Developers are encouraged to improve the flexibility of SkinMustache
-	 * whereever possible.
+	 * wherever possible.
 	 */
 }
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index d05473ac821d..0942f3b578ad 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -426,7 +426,7 @@ class SkinTemplate extends Skin {
 	 * build array of urls for personal toolbar
 	 * Please ensure setupTemplateContext is called before calling
 	 * this method.
-	 * @param bool $includeNotifications Sinc 1.36, notifications are optional
+	 * @param bool $includeNotifications Since 1.36, notifications are optional
 	 * @return array
 	 */
 	protected function buildPersonalUrls( bool $includeNotifications = true ) {
@@ -1127,7 +1127,7 @@ class SkinTemplate extends Skin {
 	/**
 	 * Run hooks relating to navigation menu data.
 	 * Skins should extend this if they want to run opinionated transformations to the data after all
-	 * hooks have been run. Note hooks are run in an arbitary order.
+	 * hooks have been run. Note hooks are run in an arbitrary order.
 	 *
 	 * @param SkinTemplate $skin
 	 * @param array &$content_navigation representing all menus.
diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php
index 95b642a52394..b6e9cfca3013 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -91,7 +91,7 @@ class SpecialPage implements MessageLocalizer {
 	private $specialPageFactory;
 
 	/**
-	 * Get the users prefered search page.
+	 * Get the users preferred search page.
 	 *
 	 * It will fall back to Special:Search if the preference points to a page
 	 * that doesn't exist or is not defined.
diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index 4869a435289f..9f6f5a40dee2 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -955,7 +955,7 @@ class SpecialBlock extends FormSpecialPage {
 		$a = XmlSelect::parseOptionsMessage( $msg );
 
 		if ( $a && $includeOther ) {
-			// if options exist, add other to the end instead of the begining (which
+			// if options exist, add other to the end instead of the beginning (which
 			// is what happens by default).
 			$a[ wfMessage( 'ipbother' )->text() ] = 'other';
 		}
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index c7c272073cfb..f1f00a847745 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -605,7 +605,7 @@ class SpecialContributions extends IncludableSpecialPage {
 				$sp->msg( 'sp-contributions-logs' )->text()
 			);
 
-			# Add link to deleted user contributions for priviledged users
+			# Add link to deleted user contributions for privileged users
 			# Todo: T183457
 			if ( $permissionManager->userHasRight( $sp->getUser(), 'deletedhistory' ) ) {
 				$tools['deletedcontribs'] = $linkRenderer->makeKnownLink(
diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php
index 6588e8c2e8ce..c02e85d455bf 100644
--- a/includes/specials/SpecialJavaScriptTest.php
+++ b/includes/specials/SpecialJavaScriptTest.php
@@ -48,7 +48,7 @@ class SpecialJavaScriptTest extends SpecialPage {
 	/**
 	 * Send the standalone JavaScript payload.
 	 *
-	 * Loaded by the GUI (on Special:JavacriptTest), and by the CLI (via grunt-karma).
+	 * Loaded by the GUI (on Special:JavaScriptTest), and by the CLI (via grunt-karma).
 	 */
 	private function exportJS() {
 		$out = $this->getOutput();
diff --git a/includes/specials/SpecialLonelyPages.php b/includes/specials/SpecialLonelyPages.php
index 7f58715a7c9d..5eac0d2222d4 100644
--- a/includes/specials/SpecialLonelyPages.php
+++ b/includes/specials/SpecialLonelyPages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Implements Special:Lonelypaages
+ * Implements Special:Lonelypages
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/includes/specials/SpecialMIMESearch.php b/includes/specials/SpecialMIMESearch.php
index 7a0ff008c1f9..ac7477b3a918 100644
--- a/includes/specials/SpecialMIMESearch.php
+++ b/includes/specials/SpecialMIMESearch.php
@@ -119,7 +119,7 @@ class SpecialMIMESearch extends QueryPage {
 	 * The index is on (img_media_type, img_major_mime, img_minor_mime)
 	 * which unfortunately doesn't have img_name at the end for sorting.
 	 * So tell db to sort it however it wishes (Its not super important
-	 * that this report gives results in a logical order). As an aditional
+	 * that this report gives results in a logical order). As an additional
 	 * note, mysql seems to by default order things by img_name ASC, which
 	 * is what we ideally want, so everything works out fine anyhow.
 	 * @return array
diff --git a/includes/specials/SpecialMediaStatistics.php b/includes/specials/SpecialMediaStatistics.php
index 2960bf677430..c3b456148287 100644
--- a/includes/specials/SpecialMediaStatistics.php
+++ b/includes/specials/SpecialMediaStatistics.php
@@ -356,7 +356,7 @@ class SpecialMediaStatistics extends QueryPage {
 	 * parse the fake title format that this special page abuses querycache with.
 	 *
 	 * @param string $fakeTitle A string formatted as <media type>;<mime type>;<count>;<bytes>
-	 * @return array The constituant parts of $fakeTitle
+	 * @return array The constituent parts of $fakeTitle
 	 */
 	private function splitFakeTitle( $fakeTitle ) {
 		return explode( ';', $fakeTitle, 4 );
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 9664aea59fb8..5c81fb395c1c 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -349,7 +349,7 @@ class SpecialUpload extends SpecialPage {
 	}
 
 	/**
-	 * Shows the "view X deleted revivions link""
+	 * Shows the "view X deleted revisions link""
 	 */
 	protected function showViewDeletedLinks() {
 		$title = Title::makeTitleSafe( NS_FILE, $this->mDesiredDestName );