Merge "Move section ID fallbacks into headers themselves"

[lhc/web/wiklou.git] / maintenance / namespaceDupes.php

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 80e8011..84d4533 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -24,11 +24,12 @@
  * @ingroup Maintenance
  */
 
+require_once __DIR__ . '/Maintenance.php';
+
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\ResultWrapper;
-
-require_once __DIR__ . '/Maintenance.php';
+use Wikimedia\Rdbms\IMaintainableDatabase;
 
 /**
  * Maintenance script that checks for articles to fix after
@@ -39,7 +40,7 @@ require_once __DIR__ . '/Maintenance.php';
 class NamespaceConflictChecker extends Maintenance {
 
        /**
-        * @var Database
+        * @var IMaintainableDatabase
         */
        protected $db;
 
@@ -255,7 +256,6 @@ class NamespaceConflictChecker extends Maintenance {
 
                $ok = true;
                foreach ( $targets as $row ) {
-
                        // Find the new title and determine the action to take
 
                        $newTitle = $this->getDestinationTitle( $ns, $name,
@@ -459,10 +459,10 @@ class NamespaceConflictChecker extends Maintenance {
 
        /**
         * Get the preferred destination title for a given target page.
-        * @param integer $ns The destination namespace ID
+        * @param int $ns The destination namespace ID
         * @param string $name The conflicting prefix
-        * @param integer $sourceNs The source namespace
-        * @param integer $sourceDbk The source DB key (i.e. page_title)
+        * @param int $sourceNs The source namespace
+        * @param int $sourceDbk The source DB key (i.e. page_title)
         * @param array $options Associative array of validated command-line options
         * @return Title|false
         */