X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FnamespaceDupes.php;h=71241e70335dc7e5debc3ca5b7e2e09a33cca61f;hb=4d3b6f213e1389fa1ef16690ed8fb49022c74336;hp=3c83921697899e3d4380eb55ca4ffe0a9b76fb39;hpb=6f7e982df6479e27c3b17f2deda8404ef55f50e6;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php index 3c83921697..71241e7033 100644 --- a/maintenance/namespaceDupes.php +++ b/maintenance/namespaceDupes.php @@ -37,7 +37,7 @@ use Wikimedia\Rdbms\IMaintainableDatabase; * * @ingroup Maintenance */ -class NamespaceConflictChecker extends Maintenance { +class NamespaceDupes extends Maintenance { /** * @var IMaintainableDatabase @@ -161,17 +161,8 @@ class NamespaceConflictChecker extends Maintenance { // break the tie by sorting by name $origSpaces = $spaces; uksort( $spaces, function ( $a, $b ) use ( $origSpaces ) { - if ( $origSpaces[$a] < $origSpaces[$b] ) { - return -1; - } elseif ( $origSpaces[$a] > $origSpaces[$b] ) { - return 1; - } elseif ( $a < $b ) { - return -1; - } elseif ( $a > $b ) { - return 1; - } else { - return 0; - } + return $origSpaces[$a] <=> $origSpaces[$b] + ?: $a <=> $b; } ); $ok = true; @@ -616,5 +607,5 @@ class NamespaceConflictChecker extends Maintenance { } } -$maintClass = NamespaceConflictChecker::class; +$maintClass = NamespaceDupes::class; require_once RUN_MAINTENANCE_IF_MAIN;