X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FCliInstaller.php;h=6ac78c40bc82dabcde4f35c84ec615b4a52ecb93;hb=5ff347bb044057d3cc560e860c85af26163bc979;hp=55ec8dfb7a5eb825a2d0092f2c1ed8f02b85fe0c;hpb=554ca56fd5e76b0216c09543d447dbecd5773202;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 55ec8dfb7a..6ac78c40bc 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -30,7 +30,7 @@
 class CliInstaller extends Installer {
 	private $specifiedScriptPath = false;
 
-	private $optionMap = array(
+	private $optionMap = [
 		'dbtype' => 'wgDBtype',
 		'dbserver' => 'wgDBserver',
 		'dbname' => 'wgDBname',
@@ -44,16 +44,14 @@ class CliInstaller extends Installer {
 		'dbpath' => 'wgSQLiteDataDir',
 		'server' => 'wgServer',
 		'scriptpath' => 'wgScriptPath',
-	);
+	];
 
 	/**
-	 * Constructor.
-	 *
 	 * @param string $siteName
 	 * @param string $admin
 	 * @param array $option
 	 */
-	function __construct( $siteName, $admin = null, array $option = array() ) {
+	function __construct( $siteName, $admin = null, array $option = [] ) {
 		global $wgContLang;
 
 		parent::__construct();
@@ -131,8 +129,8 @@ class CliInstaller extends Installer {
 		}
 
 		$this->performInstallation(
-			array( $this, 'startStage' ),
-			array( $this, 'endStage' )
+			[ $this, 'startStage' ],
+			[ $this, 'endStage' ]
 		);
 	}
 
@@ -180,7 +178,7 @@ class CliInstaller extends Installer {
 
 		$text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 &lt;$1&gt;', $text );
 
-		return html_entity_decode( strip_tags( $text ), ENT_QUOTES );
+		return Sanitizer::stripAllTags( $text );
 	}
 
 	/**
@@ -195,11 +193,11 @@ class CliInstaller extends Installer {
 
 		if ( count( $warnings ) !== 0 ) {
 			foreach ( $warnings as $w ) {
-				call_user_func_array( array( $this, 'showMessage' ), $w );
+				call_user_func_array( [ $this, 'showMessage' ], $w );
 			}
 		}
 
-		if ( !$status->isOk() ) {
+		if ( !$status->isOK() ) {
 			echo "\n";
 			exit( 1 );
 		}