From: Fomafix Date: Wed, 12 Apr 2017 15:25:28 +0000 (+0200) Subject: Remove multiple spaces in PHP files X-Git-Tag: 1.31.0-rc.0~3528 X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=464f0c72a5c97e741a7fd36998426f7efa5f9090;p=lhc%2Fweb%2Fwiklou.git Remove multiple spaces in PHP files Change-Id: Id9c26ec5ca730a9536f8fdccb8853eb03cbe87a4 --- diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 551141ec03..df49bf6b88 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -4002,7 +4002,7 @@ class OutputPage extends ContextSource { /** * Add Link headers for preloading the wiki's logo. * - * @since 1.26 + * @since 1.26 */ protected function addLogoPreloadLinkHeaders() { $logo = $this->getConfig()->get( 'Logo' ); // wgLogo @@ -4064,7 +4064,7 @@ class OutputPage extends ContextSource { // (e.g. can't express ">= 1.5 and not >= 2). // Workaround: Use <= 1.9999 in place of < 2. $upper_bound = floatval( $logos[ $i + 1 ]['dppx'] ) - 0.000001; - $media_query = '(min-resolution: ' . $logos[ $i ]['dppx'] . + $media_query = '(min-resolution: ' . $logos[ $i ]['dppx'] . 'dppx) and (max-resolution: ' . $upper_bound . 'dppx)'; } else { // Largest dppx diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index 5f6abee485..e9519c3c23 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -1784,7 +1784,7 @@ class Sanitizer { 'rb' => $common, 'rp' => $common, 'rt' => $common, # array_merge( $common, array( 'rbspan' ) ), - 'rtc' => $common, + 'rtc' => $common, # MathML root element, where used for extensions # 'title' may not be 100% valid here; it's XHTML diff --git a/includes/Title.php b/includes/Title.php index 28db064f32..95bb1d99f0 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -4650,7 +4650,7 @@ class Title implements LinkTarget { } /** - * Whether the magic words __INDEX__ and __NOINDEX__ function for this page. + * Whether the magic words __INDEX__ and __NOINDEX__ function for this page. * * @return bool */ diff --git a/includes/WatchedItemQueryService.php b/includes/WatchedItemQueryService.php index ba7707411a..22d5439c06 100644 --- a/includes/WatchedItemQueryService.php +++ b/includes/WatchedItemQueryService.php @@ -390,7 +390,7 @@ class WatchedItemQueryService { } if ( array_key_exists( 'rcTypes', $options ) ) { - $conds['rc_type'] = array_map( 'intval', $options['rcTypes'] ); + $conds['rc_type'] = array_map( 'intval', $options['rcTypes'] ); } $conds = array_merge( @@ -565,7 +565,7 @@ class WatchedItemQueryService { } if ( isset( $options['filter'] ) ) { $filter = $options['filter']; - if ( $filter === self::FILTER_CHANGED ) { + if ( $filter === self::FILTER_CHANGED ) { $conds[] = 'wl_notificationtimestamp IS NOT NULL'; } else { $conds[] = 'wl_notificationtimestamp IS NULL'; diff --git a/includes/WikiMap.php b/includes/WikiMap.php index f7b8d2f16d..0f479ace61 100644 --- a/includes/WikiMap.php +++ b/includes/WikiMap.php @@ -182,7 +182,7 @@ class WikiMap { class WikiReference { private $mCanonicalServer; ///< canonical server URL, e.g. 'https://www.mediawiki.org' private $mServer; ///< server URL, may be protocol-relative, e.g. '//www.mediawiki.org' - private $mPath; ///< path, '/wiki/$1' + private $mPath; ///< path, '/wiki/$1' /** * @param string $canonicalServer diff --git a/includes/auth/Throttler.php b/includes/auth/Throttler.php index 6d3b2f46e6..8a10ecb065 100644 --- a/includes/auth/Throttler.php +++ b/includes/auth/Throttler.php @@ -130,7 +130,7 @@ class Throttler implements LoggerAwareInterface { $throttleKey = wfGlobalCacheKey( 'throttler', $this->type, $index, $ipKey, $userKey ); $throttleCount = $this->cache->get( $throttleKey ); - if ( !$throttleCount ) { // counter not started yet + if ( !$throttleCount ) { // counter not started yet $this->cache->add( $throttleKey, 1, $expiry ); } elseif ( $throttleCount < $count ) { // throttle limited not yet reached $this->cache->incr( $throttleKey ); diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index dcab158ddb..35f8b3b95e 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -874,7 +874,7 @@ class RecentChange { 'rc_logid' => 0, 'rc_log_type' => null, 'rc_log_action' => '', - 'rc_params' => serialize( [ + 'rc_params' => serialize( [ 'hidden-cat' => WikiCategoryPage::factory( $categoryTitle )->isHidden() ] ) ]; diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php index 56979609f2..a629458cc5 100644 --- a/includes/deferred/LinksUpdate.php +++ b/includes/deferred/LinksUpdate.php @@ -409,7 +409,7 @@ class LinksUpdate extends DataUpdate implements EnqueueableDataUpdate { $deleteWheres = []; // list of WHERE clause arrays for each DB delete() call if ( $table === 'pagelinks' || $table === 'templatelinks' || $table === 'iwlinks' ) { - $baseKey = ( $table === 'iwlinks' ) ? 'iwl_prefix' : "{$prefix}_namespace"; + $baseKey = ( $table === 'iwlinks' ) ? 'iwl_prefix' : "{$prefix}_namespace"; $curBatchSize = 0; $curDeletionBatch = []; diff --git a/includes/htmlform/OOUIHTMLForm.php b/includes/htmlform/OOUIHTMLForm.php index 54bdf04272..549edde610 100644 --- a/includes/htmlform/OOUIHTMLForm.php +++ b/includes/htmlform/OOUIHTMLForm.php @@ -207,7 +207,7 @@ class OOUIHTMLForm extends HTMLForm { $error = array_merge( [ $error['message'] ], $error['params'] ); } } - } elseif ( $elementsType === 'errors' ) { + } elseif ( $elementsType === 'errors' ) { $errors = $elements; if ( !is_array( $errors ) ) { $errors = [ $errors ]; diff --git a/includes/http/CurlHttpRequest.php b/includes/http/CurlHttpRequest.php index f958ff657d..3da3eb325c 100644 --- a/includes/http/CurlHttpRequest.php +++ b/includes/http/CurlHttpRequest.php @@ -145,7 +145,7 @@ class CurlHttpRequest extends MWHttpRequest { $this->parseHeader(); $this->setStatus(); - return Status::wrap( $this->status ); // TODO B/C; move this to callers + return Status::wrap( $this->status ); // TODO B/C; move this to callers } /** diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index ad9a248ec6..97d1dcb2d0 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -379,7 +379,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { }, 'cssClassSuffix' => 'patrolled', 'isRowApplicableCallable' => function ( $ctx, $rc ) { - return $rc->getAttribute( 'rc_patrolled' ); + return $rc->getAttribute( 'rc_patrolled' ); }, ], [ @@ -394,7 +394,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { }, 'cssClassSuffix' => 'unpatrolled', 'isRowApplicableCallable' => function ( $ctx, $rc ) { - return !$rc->getAttribute( 'rc_patrolled' ); + return !$rc->getAttribute( 'rc_patrolled' ); }, ], ], @@ -1169,9 +1169,9 @@ abstract class ChangesListSpecialPage extends SpecialPage { &$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedExpLevels ) { global $wgLearnerEdits, - $wgExperiencedUserEdits, - $wgLearnerMemberSince, - $wgExperiencedUserMemberSince; + $wgExperiencedUserEdits, + $wgLearnerMemberSince, + $wgExperiencedUserMemberSince; $LEVEL_COUNT = 3; @@ -1207,7 +1207,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { ); if ( $selectedExpLevels === [ 'newcomer' ] ) { - $conds[] = "NOT ( $aboveNewcomer )"; + $conds[] = "NOT ( $aboveNewcomer )"; } elseif ( $selectedExpLevels === [ 'learner' ] ) { $conds[] = $dbr->makeList( [ $aboveNewcomer, "NOT ( $aboveLearner )" ], diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php index a69406cb8d..830b43817f 100644 --- a/includes/specials/SpecialEmailuser.php +++ b/includes/specials/SpecialEmailuser.php @@ -289,7 +289,7 @@ class SpecialEmailUser extends UnlistedSpecialPage { 'text', [ 'id' => 'emailusertarget', - 'class' => 'mw-autocomplete-user', // used by mediawiki.userSuggest + 'class' => 'mw-autocomplete-user', // used by mediawiki.userSuggest 'autofocus' => true, 'size' => 30, ] diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index c1c9ab0f27..e9d3f26f76 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -111,7 +111,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { */ protected function transformFilterDefinition( array $filterDefinition ) { if ( isset( $filterDefinition['showHideSuffix'] ) ) { - $filterDefinition['showHide'] = 'wl' . $filterDefinition['showHideSuffix']; + $filterDefinition['showHide'] = 'wl' . $filterDefinition['showHideSuffix']; } return $filterDefinition;