Merge "Set $_SERVER['SERVER_NAME'] to the value set by --server"

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

diff --git a/maintenance/importSites.php b/maintenance/importSites.php
index c5c00aa..be6cc05 100644 (file)
--- a/maintenance/importSites.php
+++ b/maintenance/importSites.php
@@ -15,7 +15,7 @@ require_once $basePath . '/maintenance/Maintenance.php';
 class ImportSites extends Maintenance {
 
        public function __construct() {
-               $this->mDescription = 'Imports site definitions from XML into the sites table.';
+               $this->addDescription( 'Imports site definitions from XML into the sites table.' );
 
                $this->addArg( 'file', 'An XML file containing site definitions (see docs/sitelist.txt). ' .
                        'Use "php://stdin" to read from stdin.', true
@@ -30,8 +30,9 @@ class ImportSites extends Maintenance {
        public function execute() {
                $file = $this->getArg( 0 );
 
-               $importer = new SiteImporter( SiteSQLStore::newInstance() );
-               $importer->setExceptionCallback( array( $this, 'reportException' ) );
+               $siteStore = \MediaWiki\MediaWikiServices::getInstance()->getSiteStore();
+               $importer = new SiteImporter( $siteStore );
+               $importer->setExceptionCallback( [ $this, 'reportException' ] );
 
                $importer->importFromFile( $file );
 
@@ -49,5 +50,5 @@ class ImportSites extends Maintenance {
        }
 }
 
-$maintClass = 'ImportSites';
+$maintClass = ImportSites::class;
 require_once RUN_MAINTENANCE_IF_MAIN;