diff options
author | Thiemo Kreuz <thiemo.kreuz@wikimedia.de> | 2019-01-09 17:24:36 +0100 |
---|---|---|
committer | Thiemo Kreuz <thiemo.kreuz@wikimedia.de> | 2019-01-15 17:28:49 +0100 |
commit | 734a969d5506a80ceabfa2bc61bda79f76d73d5f (patch) | |
tree | eaa619f76fce39e07f8e755593bb0cd7c80520ad /includes/specials | |
parent | a4880e9bbfd90642cfa5b852bdabf4101760f092 (diff) | |
download | mediawikicore-734a969d5506a80ceabfa2bc61bda79f76d73d5f.tar.gz mediawikicore-734a969d5506a80ceabfa2bc61bda79f76d73d5f.zip |
Safe replacement of a lot of `!count()` with `=== []`
This was originally a global search and replace. I manually checked all
replacements and reverted them if (due to the lack of type hints) either
null (that would be 0 when counted) or a Countable object can end in the
variable or property in question.
Now this patch only touches places where I'm sure nothing can break.
For the sanity of the honorable reviewers this patch is exclusively touching
negated counts. You should not find a single `!== []` in this patch, that
would be a mistake.
Change-Id: I5eafd4d8fccdb53a668be8e6f25a566f9c3a0a95
Diffstat (limited to 'includes/specials')
-rw-r--r-- | includes/specials/SpecialEditWatchlist.php | 2 | ||||
-rw-r--r-- | includes/specials/SpecialListgrants.php | 2 | ||||
-rw-r--r-- | includes/specials/SpecialPasswordPolicies.php | 2 | ||||
-rw-r--r-- | includes/specials/SpecialRecentchanges.php | 4 | ||||
-rw-r--r-- | includes/specials/SpecialSearch.php | 4 | ||||
-rw-r--r-- | includes/specials/SpecialSpecialpages.php | 2 | ||||
-rw-r--r-- | includes/specials/SpecialTrackingCategories.php | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php index 70b420763855..b05c81ab1ac2 100644 --- a/includes/specials/SpecialEditWatchlist.php +++ b/includes/specials/SpecialEditWatchlist.php @@ -431,7 +431,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage { * Attempts to clean up broken items */ private function cleanupWatchlist() { - if ( !count( $this->badItems ) ) { + if ( $this->badItems === [] ) { return; // nothing to do } diff --git a/includes/specials/SpecialListgrants.php b/includes/specials/SpecialListgrants.php index 1a04eec473f8..ba16baf92439 100644 --- a/includes/specials/SpecialListgrants.php +++ b/includes/specials/SpecialListgrants.php @@ -62,7 +62,7 @@ class SpecialListGrants extends SpecialPage { '<span class="mw-listgrants-right-name">' . $permission . '</span>' )->parse(); } - if ( !count( $descs ) ) { + if ( $descs === [] ) { $grantCellHtml = ''; } else { sort( $descs ); diff --git a/includes/specials/SpecialPasswordPolicies.php b/includes/specials/SpecialPasswordPolicies.php index 0a3a6799a5f2..573dcb52aaf4 100644 --- a/includes/specials/SpecialPasswordPolicies.php +++ b/includes/specials/SpecialPasswordPolicies.php @@ -151,7 +151,7 @@ class SpecialPasswordPolicies extends SpecialPage { '<span class="mw-passwordpolicies-policy-name">' . $gp . '</span>' )->parse(); } - if ( !count( $ret ) ) { + if ( $ret === [] ) { return ''; } else { return '<ul><li>' . implode( "</li>\n<li>", $ret ) . '</li></ul>'; diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 60e797e0c3a8..b566305fc56c 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -709,7 +709,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { $categories = array_map( 'trim', explode( '|', $opts['categories'] ) ); - if ( !count( $categories ) ) { + if ( $categories === [] ) { return; } @@ -744,7 +744,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { } # Shortcut? - if ( !count( $articles ) || !count( $cats ) ) { + if ( $articles === [] || $cats === [] ) { return; } diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index d904ad16d3d2..ec6c5b94c99b 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -212,13 +212,13 @@ class SpecialSearch extends SpecialPage { # Extract manually requested namespaces $nslist = $this->powerSearch( $request ); - if ( !count( $nslist ) ) { + if ( $nslist === [] ) { # Fallback to user preference $nslist = $this->searchConfig->userNamespaces( $user ); } $profile = null; - if ( !count( $nslist ) ) { + if ( $nslist === [] ) { $profile = 'default'; } diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php index 585a7cd35f3b..9de31da3314a 100644 --- a/includes/specials/SpecialSpecialpages.php +++ b/includes/specials/SpecialSpecialpages.php @@ -55,7 +55,7 @@ class SpecialSpecialpages extends UnlistedSpecialPage { $pages = MediaWikiServices::getInstance()->getSpecialPageFactory()-> getUsablePages( $this->getUser() ); - if ( !count( $pages ) ) { + if ( $pages === [] ) { # Yeah, that was pointless. Thanks for coming. return false; } diff --git a/includes/specials/SpecialTrackingCategories.php b/includes/specials/SpecialTrackingCategories.php index 3ee7cea1ca0a..4a586b7312c6 100644 --- a/includes/specials/SpecialTrackingCategories.php +++ b/includes/specials/SpecialTrackingCategories.php @@ -94,7 +94,7 @@ class SpecialTrackingCategories extends SpecialPage { } # Extra message, when no category was found - if ( !count( $allMsgs ) ) { + if ( $allMsgs === [] ) { $allMsgs[] = $this->msg( 'trackingcategories-disabled' )->parse(); } |