Merge "Avoid passing "false" as keys to MapCacheLRU in RepoGroup"

[lhc/web/wiklou.git] / includes / api / ApiQueryUserContribs.php

diff --git a/includes/api/ApiQueryUserContribs.php b/includes/api/ApiQueryUserContribs.php
index 140ff6d..fdcaa76 100644 (file)
--- a/includes/api/ApiQueryUserContribs.php
+++ b/includes/api/ApiQueryUserContribs.php
@@ -306,9 +306,11 @@ class ApiQueryUserContribs extends ApiQueryBase {
                                foreach ( $res as $row ) {
                                        $names[$row->user_name] = $row;
                                }
-                               call_user_func_array(
-                                       $this->params['dir'] == 'newer' ? 'ksort' : 'krsort', [ &$names, SORT_STRING ]
-                               );
+                               if ( $this->params['dir'] == 'newer' ) {
+                                       ksort( $names, SORT_STRING );
+                               } else {
+                                       krsort( $names, SORT_STRING );
+                               }
                                $neg = $op === '>' ? -1 : 1;
                                $userIter = call_user_func( function () use ( $names, $fromName, $neg ) {
                                        foreach ( $names as $name => $row ) {
@@ -367,11 +369,11 @@ class ApiQueryUserContribs extends ApiQueryBase {
                                if ( $batchSize === 1 ) { // One user, can't be different
                                        $ret = 0;
                                } elseif ( $this->orderBy === 'id' ) {
-                                       $ret = $a[0]->rev_user - $b[0]->rev_user;
+                                       $ret = $a[0]->rev_user <=> $b[0]->rev_user;
                                } elseif ( $this->orderBy === 'name' ) {
                                        $ret = strcmp( $a[0]->rev_user_text, $b[0]->rev_user_text );
                                } else {
-                                       $ret = $a[0]->rev_actor - $b[0]->rev_actor;
+                                       $ret = $a[0]->rev_actor <=> $b[0]->rev_actor;
                                }
 
                                if ( !$ret ) {
@@ -382,7 +384,7 @@ class ApiQueryUserContribs extends ApiQueryBase {
                                }
 
                                if ( !$ret ) {
-                                       $ret = $a[0]->rev_id - $b[0]->rev_id;
+                                       $ret = $a[0]->rev_id <=> $b[0]->rev_id;
                                }
 
                                return $neg * $ret;
@@ -691,9 +693,7 @@ class ApiQueryUserContribs extends ApiQueryBase {
                        && !is_null( $row->rev_len )
                        && !is_null( $row->rev_parent_id )
                ) {
-                       $parentLen = isset( $this->parentLens[$row->rev_parent_id] )
-                               ? $this->parentLens[$row->rev_parent_id]
-                               : 0;
+                       $parentLen = $this->parentLens[$row->rev_parent_id] ?? 0;
                        $vals['sizediff'] = intval( $row->rev_len - $parentLen );
                }