diff options
author | Umherirrender <umherirrender_de.wp@web.de> | 2017-07-01 10:32:08 +0200 |
---|---|---|
committer | Umherirrender <umherirrender_de.wp@web.de> | 2017-07-01 11:34:16 +0000 |
commit | b5cddfb27b0d50bd396b1ff92d022b2dec766754 (patch) | |
tree | edcd059a49266fe8940f0d26e90a7816b460ade5 /includes/specials | |
parent | c47221ab8246b0428628500cfe0fdcd11f96bcf3 (diff) | |
download | mediawikicore-b5cddfb27b0d50bd396b1ff92d022b2dec766754.tar.gz mediawikicore-b5cddfb27b0d50bd396b1ff92d022b2dec766754.zip |
Remove empty lines at begin of function, if, foreach, switch
Organize phpcs.xml a bit
Change-Id: Ifb767729b481b4b686e6d6444cf48b1f580cc478
Diffstat (limited to 'includes/specials')
-rw-r--r-- | includes/specials/SpecialChangeEmail.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialContributions.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialExport.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialPageData.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialRecentchanges.php | 8 | ||||
-rw-r--r-- | includes/specials/SpecialRecentchangeslinked.php | 4 | ||||
-rw-r--r-- | includes/specials/SpecialSearch.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialSpecialpages.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialStatistics.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialTags.php | 2 | ||||
-rw-r--r-- | includes/specials/SpecialUpload.php | 1 | ||||
-rw-r--r-- | includes/specials/SpecialUserrights.php | 8 | ||||
-rw-r--r-- | includes/specials/SpecialWatchlist.php | 8 |
13 files changed, 14 insertions, 24 deletions
diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php index eb98fe76a757..c5143002c3f8 100644 --- a/includes/specials/SpecialChangeEmail.php +++ b/includes/specials/SpecialChangeEmail.php @@ -63,7 +63,6 @@ class SpecialChangeEmail extends FormSpecialPage { } protected function checkExecutePermissions( User $user ) { - if ( !AuthManager::singleton()->allowsPropertyChange( 'emailaddress' ) ) { throw new ErrorPageError( 'changeemail', 'cannotchangeemail' ); } diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 40706aceed38..38456493140b 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -329,7 +329,6 @@ class SpecialContributions extends IncludableSpecialPage { * @return array */ public static function getUserLinks( SpecialPage $sp, User $target ) { - $id = $target->getId(); $username = $target->getName(); $userpage = $target->getUserPage(); diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php index f5e9e49b6985..d5c5528d7a8b 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -330,7 +330,6 @@ class SpecialExport extends SpecialPage { * @param bool $exportall Whether to export everything */ private function doExport( $page, $history, $list_authors, $exportall ) { - // If we are grabbing everything, enable full history and ignore the rest if ( $exportall ) { $history = WikiExporter::FULL; diff --git a/includes/specials/SpecialPageData.php b/includes/specials/SpecialPageData.php index f7084a870e10..c52c426e8875 100644 --- a/includes/specials/SpecialPageData.php +++ b/includes/specials/SpecialPageData.php @@ -48,7 +48,6 @@ class SpecialPageData extends SpecialPage { * @return PageDataRequestHandler */ private function newDefaultRequestHandler() { - return new PageDataRequestHandler(); } diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 75d104bb144f..21f6b691c622 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -367,8 +367,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage { * @inheritdoc */ protected function buildQuery( &$tables, &$fields, &$conds, - &$query_options, &$join_conds, FormOptions $opts ) { - + &$query_options, &$join_conds, FormOptions $opts + ) { $dbr = $this->getDB(); parent::buildQuery( $tables, $fields, $conds, $query_options, $join_conds, $opts ); @@ -392,8 +392,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage { * @inheritdoc */ protected function doMainQuery( $tables, $fields, $conds, $query_options, - $join_conds, FormOptions $opts ) { - + $join_conds, FormOptions $opts + ) { $dbr = $this->getDB(); $user = $this->getUser(); diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php index 873285b8c763..b3b921038044 100644 --- a/includes/specials/SpecialRecentchangeslinked.php +++ b/includes/specials/SpecialRecentchangeslinked.php @@ -50,8 +50,8 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges { * @inheritdoc */ protected function doMainQuery( $tables, $select, $conds, $query_options, - $join_conds, FormOptions $opts ) { - + $join_conds, FormOptions $opts + ) { $target = $opts['target']; $showlinkedto = $opts['showlinkedto']; $limit = $opts['limit']; diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index e89dbc96ed45..e5adeb53b4f4 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -399,7 +399,6 @@ class SpecialSearch extends SpecialPage { $mainResultWidget = new FullSearchResultWidget( $this, $linkRenderer ); if ( $search->getFeatureData( 'enable-new-crossproject-page' ) ) { - $sidebarResultWidget = new InterwikiSearchResultWidget( $this, $linkRenderer ); $sidebarResultsWidget = new InterwikiSearchResultSetWidget( $this, diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php index b18b370c6b91..451669ce6104 100644 --- a/includes/specials/SpecialSpecialpages.php +++ b/includes/specials/SpecialSpecialpages.php @@ -96,7 +96,6 @@ class SpecialSpecialpages extends UnlistedSpecialPage { $includesCachedPages = false; foreach ( $groups as $group => $sortedPages ) { - $out->wrapWikiMsg( "<h2 class=\"mw-specialpagesgroup\" id=\"mw-specialpagesgroup-$group\">$1</h2>\n", "specialpages-group-$group" diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php index 19850e6a2dd2..a60549bf739a 100644 --- a/includes/specials/SpecialStatistics.php +++ b/includes/specials/SpecialStatistics.php @@ -253,7 +253,6 @@ class SpecialStatistics extends SpecialPage { foreach ( $stats as $header => $items ) { // Identify the structure used if ( is_array( $items ) ) { - // Ignore headers that are recursively set as legacy header if ( $header !== 'statistics-header-hooks' ) { $return .= $this->formatRowHeader( $header ); diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php index e67356f616cd..605ee008d857 100644 --- a/includes/specials/SpecialTags.php +++ b/includes/specials/SpecialTags.php @@ -246,7 +246,6 @@ class SpecialTags extends SpecialPage { } if ( $showManageActions ) { // we've already checked that the user had the requisite userright - // activate if ( ChangeTags::canActivateTag( $tag )->isOK() ) { $actionLinks[] = $linkRenderer->makeKnownLink( @@ -264,7 +263,6 @@ class SpecialTags extends SpecialPage { [], [ 'tag' => $tag ] ); } - } if ( $showDeleteActions || $showManageActions ) { diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index def639d83b42..073e58df15cd 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -678,7 +678,6 @@ class SpecialUpload extends SpecialPage { */ protected function processVerificationError( $details ) { switch ( $details['status'] ) { - /** Statuses that only require name changing **/ case UploadBase::MIN_LENGTH_PARTNAME: $this->showRecoverableUploadError( $this->msg( 'minlength1' )->escaped() ); diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index d0a0317fa8f1..0a712eff21a1 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -326,8 +326,8 @@ class UserrightsPage extends SpecialPage { * @return array Tuple of added, then removed groups */ function doSaveUserGroups( $user, $add, $remove, $reason = '', $tags = [], - $groupExpiries = [] ) { - + $groupExpiries = [] + ) { // Validate input set... $isself = $user->getName() == $this->getUser()->getName(); $groups = $user->getGroups(); @@ -433,8 +433,8 @@ class UserrightsPage extends SpecialPage { * @param array $newUGMs Associative array of (group name => UserGroupMembership) */ protected function addLogEntry( $user, $oldGroups, $newGroups, $reason, $tags, - $oldUGMs, $newUGMs ) { - + $oldUGMs, $newUGMs + ) { // make sure $oldUGMs and $newUGMs are in the same order, and serialise // each UGM object to a simplified array $oldUGMs = array_map( function ( $group ) use ( $oldUGMs ) { diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index e9d3f26f76d4..65131ec25f09 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -246,8 +246,8 @@ class SpecialWatchlist extends ChangesListSpecialPage { * @inheritdoc */ protected function buildQuery( &$tables, &$fields, &$conds, &$query_options, - &$join_conds, FormOptions $opts ) { - + &$join_conds, FormOptions $opts + ) { $dbr = $this->getDB(); parent::buildQuery( $tables, $fields, $conds, $query_options, $join_conds, $opts ); @@ -263,8 +263,8 @@ class SpecialWatchlist extends ChangesListSpecialPage { * @inheritdoc */ protected function doMainQuery( $tables, $fields, $conds, $query_options, - $join_conds, FormOptions $opts ) { - + $join_conds, FormOptions $opts + ) { $dbr = $this->getDB(); $user = $this->getUser(); |