X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiImport.php;h=3f48f38a0ef18312d01d6c881d7338f8b05e4e99;hp=f0ca6fe4ad96cdf88dc0c90164d2631ba6dd6d9a;hb=ce079cf6ad79ca8d3360817f809b219d166f9153;hpb=ebffed29d7034e3f1a1734dc8f8280d3ec84b5d7

diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php
index f0ca6fe4ad..3f48f38a0e 100644
--- a/includes/api/ApiImport.php
+++ b/includes/api/ApiImport.php
@@ -42,10 +42,10 @@ class ApiImport extends ApiBase {
 		$isUpload = false;
 		if ( isset( $params['interwikisource'] ) ) {
 			if ( !$user->isAllowed( 'import' ) ) {
-				$this->dieUsageMsg( 'cantimport' );
+				$this->dieWithError( 'apierror-cantimport' );
 			}
 			if ( !isset( $params['interwikipage'] ) ) {
-				$this->dieUsageMsg( array( 'missingparam', 'interwikipage' ) );
+				$this->dieWithError( [ 'apierror-missingparam', 'interwikipage' ] );
 			}
 			$source = ImportStreamSource::newFromInterwiki(
 				$params['interwikisource'],
@@ -56,7 +56,7 @@ class ApiImport extends ApiBase {
 		} else {
 			$isUpload = true;
 			if ( !$user->isAllowed( 'importupload' ) ) {
-				$this->dieUsageMsg( 'cantimport-upload' );
+				$this->dieWithError( 'apierror-cantimport-upload' );
 			}
 			$source = ImportStreamSource::newFromUpload( 'xml' );
 		}
@@ -83,7 +83,7 @@ class ApiImport extends ApiBase {
 		try {
 			$importer->doImport();
 		} catch ( Exception $e ) {
-			$this->dieUsageMsg( array( 'import-unknownerror', $e->getMessage() ) );
+			$this->dieWithError( [ 'apierror-import-unknownerror', wfEscapeWikiText( $e->getMessage() ) ] );
 		}
 
 		$resultData = $reporter->getData();
@@ -101,9 +101,9 @@ class ApiImport extends ApiBase {
 	 */
 	public function getAllowedImportSources() {
 		$importSources = $this->getConfig()->get( 'ImportSources' );
-		Hooks::run( 'ImportSources', array( &$importSources ) );
+		Hooks::run( 'ImportSources', [ &$importSources ] );
 
-		$result = array();
+		$result = [];
 		foreach ( $importSources as $key => $value ) {
 			if ( is_int( $key ) ) {
 				$result[] = $value;
@@ -125,22 +125,22 @@ class ApiImport extends ApiBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
+		return [
 			'summary' => null,
-			'xml' => array(
+			'xml' => [
 				ApiBase::PARAM_TYPE => 'upload',
-			),
-			'interwikisource' => array(
+			],
+			'interwikisource' => [
 				ApiBase::PARAM_TYPE => $this->getAllowedImportSources(),
-			),
+			],
 			'interwikipage' => null,
 			'fullhistory' => false,
 			'templates' => false,
-			'namespace' => array(
+			'namespace' => [
 				ApiBase::PARAM_TYPE => 'namespace'
-			),
+			],
 			'rootpage' => null,
-		);
+		];
 	}
 
 	public function needsToken() {
@@ -148,11 +148,11 @@ class ApiImport extends ApiBase {
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=import&interwikisource=meta&interwikipage=Help:ParserFunctions&' .
 				'namespace=100&fullhistory=&token=123ABC'
 				=> 'apihelp-import-example-import',
-		);
+		];
 	}
 
 	public function getHelpUrls() {
@@ -165,7 +165,7 @@ class ApiImport extends ApiBase {
  * @ingroup API
  */
 class ApiImportReporter extends ImportReporter {
-	private $mResultArr = array();
+	private $mResultArr = [];
 
 	/**
 	 * @param Title $title
@@ -175,9 +175,9 @@ class ApiImportReporter extends ImportReporter {
 	 * @param array $pageInfo
 	 * @return void
 	 */
-	function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) {
+	public function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) {
 		// Add a result entry
-		$r = array();
+		$r = [];
 
 		if ( $title === null ) {
 			# Invalid or non-importable title
@@ -194,7 +194,7 @@ class ApiImportReporter extends ImportReporter {
 		parent::reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo );
 	}
 
-	function getData() {
+	public function getData() {
 		return $this->mResultArr;
 	}
 }