Deprecate wrapper SVGMetadataExtractor::getMetadata

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

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 3c73306..5024395 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -28,7 +28,8 @@ require_once __DIR__ . '/Maintenance.php';
 
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
+use MediaWiki\Storage\RevisionRecord;
+use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 
 /**
@@ -429,7 +430,7 @@ class NamespaceDupes extends Maintenance {
         * @param string $name Prefix that is being made a namespace
         * @param array $options Associative array of validated command-line options
         *
-        * @return ResultWrapper
+        * @return IResultWrapper
         */
        private function getTargetList( $ns, $name, $options ) {
                if (
@@ -558,8 +559,12 @@ class NamespaceDupes extends Maintenance {
         * @return bool
         */
        private function canMerge( $id, LinkTarget $linkTarget, &$logStatus ) {
-               $latestDest = Revision::newFromTitle( $linkTarget, 0, Revision::READ_LATEST );
-               $latestSource = Revision::newFromPageId( $id, 0, Revision::READ_LATEST );
+               $latestDest = Revision::newFromTitle(
+                       $linkTarget, 0, RevisionRecord::READ_LATEST
+               );
+               $latestSource = Revision::newFromPageId(
+                       $id, 0, RevisionRecord::READ_LATEST
+               );
                if ( $latestSource->getTimestamp() > $latestDest->getTimestamp() ) {
                        $logStatus = 'cannot merge since source is later';
                        return false;