Merge "General whitespace clean-up of tabs followed by multiple spaces"

includes/Feed/FeedUtils.php

@@ -141,8 +141,8 @@ class FeedUtils {
 	 * @param string $actiontext Text of the action; in case of log event
 	 * @return string
 	 */
-	public static function formatDiffRow2( $title, $oldid, $newid, $timestamp,
-										  $formattedComment, $actiontext = ''
+	public static function formatDiffRow2(
+		$title, $oldid, $newid, $timestamp, $formattedComment, $actiontext = ''
 	) {
 		$feedDiffCutoff = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::FeedDiffCutoff );
 

includes/Revision/RevisionStore.php

@@ -1929,7 +1929,7 @@ class RevisionStore
 	 *        from Article Id associated with the page, an InvalidArgumentException is thrown.
 	 *
 	 * @return StatusValue a status with a RevisionRecord[] of successfully fetched revisions
-	 * 					   and an array of errors for the revisions failed to fetch.
+	 *                     and an array of errors for the revisions failed to fetch.
 	 */
 	public function newRevisionsFromBatch(
 		$rows,

includes/api/ApiQueryRevisions.php

@@ -250,15 +250,15 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase {
 				$uqb = $db->newUnionQueryBuilder();
 				$uqb->add(
 					$db->newSelectQueryBuilder()
-					   ->select( [ 'id' => 'rev_id', 'ts' => 'rev_timestamp' ] )
-					   ->from( 'revision' )
-					   ->where( [ 'rev_id' => $revids ] )
+						->select( [ 'id' => 'rev_id', 'ts' => 'rev_timestamp' ] )
+						->from( 'revision' )
+						->where( [ 'rev_id' => $revids ] )
 				);
 				$uqb->add(
 					$db->newSelectQueryBuilder()
-					   ->select( [ 'id' => 'ar_rev_id', 'ts' => 'ar_timestamp' ] )
-					   ->from( 'archive' )
-					   ->where( [ 'ar_rev_id' => $revids ] )
+						->select( [ 'id' => 'ar_rev_id', 'ts' => 'ar_timestamp' ] )
+						->from( 'archive' )
+						->where( [ 'ar_rev_id' => $revids ] )
 				);
 				$res = $uqb->caller( __METHOD__ )->fetchResultSet();
 				foreach ( $res as $row ) {

includes/block/DatabaseBlock.php

@@ -714,8 +714,8 @@ class DatabaseBlock extends AbstractBlock {
 				->update( 'ipblocks' )
 				->set(
 					[
-					  'ipb_timestamp' => $dbw->timestamp( $this->getTimestamp() ),
-					  'ipb_expiry' => $dbw->timestamp( $this->getExpiry() ),
+						'ipb_timestamp' => $dbw->timestamp( $this->getTimestamp() ),
+						'ipb_expiry' => $dbw->timestamp( $this->getExpiry() ),
 					]
 				)
 				->where( [ 'ipb_id' => $this->getId( $this->getWikiId() ) ] )

includes/parser/Parsoid/LanguageVariantConverter.php

@@ -114,7 +114,7 @@ class LanguageVariantConverter {
 	 * @param ?Bcp47Code $sourceVariant
 	 *
 	 * @return PageBundle The converted PageBundle, or the object passed in as
-	 * 	       $pageBundle if the conversion is not supported.
+	 *         $pageBundle if the conversion is not supported.
 	 * @throws HttpException
 	 */
 	public function convertPageBundleVariant(

includes/skins/components/SkinComponentLink.php

@@ -161,11 +161,13 @@ class SkinComponentLink implements SkinComponent {
 		$linkHtmlAttributes = [];
 		if ( $isLink ) {
 			$attrs = $item;
-			foreach ( [ 'single-id', 'text', 'msg', 'tooltiponly', 'context', 'primary',
-						  // These fields provide context for skins to modify classes.
-						  // They should not be outputted to skin.
-						  'icon', 'button',
-						  'tooltip-params', 'exists', 'link-html' ] as $k ) {
+			foreach ( [
+				'single-id', 'text', 'msg', 'tooltiponly', 'context', 'primary',
+				// These fields provide context for skins to modify classes.
+				// They should not be outputted to skin.
+				'icon', 'button',
+				'tooltip-params', 'exists', 'link-html' ] as $k
+			) {
 				unset( $attrs[$k] );
 			}
 

includes/specials/SpecialListGrants.php

@@ -55,8 +55,7 @@ class SpecialListGrants extends SpecialPage {
 		$out->addModuleStyles( 'mediawiki.special' );
 
 		$out->addHTML(
-			Html::openElement( 'table',
-											   [ 'class' => 'wikitable mw-listgrouprights-table' ] ) .
+			Html::openElement( 'table', [ 'class' => 'wikitable mw-listgrouprights-table' ] ) .
 				'<tr>' .
 				Html::element( 'th', [], $this->msg( 'listgrants-grant' )->text() ) .
 				Html::element( 'th', [], $this->msg( 'listgrants-rights' )->text() ) .

tests/phpunit/includes/ResourceLoader/ResourceLoaderTest.php

@@ -958,7 +958,7 @@ END
 	 */
 	public function testMakeModuleResponseExtraHeaders() {
 		$module = $this->getMockBuilder( ResourceLoaderTestModule::class )
-					   ->onlyMethods( [ 'getPreloadLinks', 'getName' ] )->getMock();
+			->onlyMethods( [ 'getPreloadLinks', 'getName' ] )->getMock();
 		$module->method( 'getPreloadLinks' )->willReturn( [
 			'https://example.org/script.js' => [ 'as' => 'script' ],
 		] );

tests/phpunit/unit/includes/parser/Parsoid/LanguageVariantConverterUnitTest.php

@@ -525,9 +525,9 @@ class LanguageVariantConverterUnitTest extends MediaWikiUnitTestCase {
 				return $text;
 			} );
 		$languageConverter->method( 'hasVariant' )
-		   ->willReturnCallback( static function ( $code ) {
-			   return true;
-		   } );
+			->willReturnCallback( static function ( $code ) {
+				return true;
+			} );
 		$languageConverterFactoryMock->method( 'getLanguageConverter' )
 			->willReturn( $languageConverter );