dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resourceloader: CSSMin::getLocalFileReferences now strips anchors"
[lhc/web/wiklou.git]
/
includes
/
installer
/
CliInstaller.php
diff --git
a/includes/installer/CliInstaller.php
b/includes/installer/CliInstaller.php
index
715f5df
..
4f531da
100644
(file)
--- a/
includes/installer/CliInstaller.php
+++ b/
includes/installer/CliInstaller.php
@@
-38,7
+38,6
@@
class CliInstaller extends Installer {
'dbpass' => 'wgDBpassword',
'dbprefix' => 'wgDBprefix',
'dbtableoptions' => 'wgDBTableOptions',
'dbpass' => 'wgDBpassword',
'dbprefix' => 'wgDBprefix',
'dbtableoptions' => 'wgDBTableOptions',
- 'dbmysql5' => 'wgDBmysql5',
'dbport' => 'wgDBport',
'dbschema' => 'wgDBmwschema',
'dbpath' => 'wgSQLiteDataDir',
'dbport' => 'wgDBport',
'dbschema' => 'wgDBmwschema',
'dbpath' => 'wgSQLiteDataDir',
@@
-48,7
+47,7
@@
class CliInstaller extends Installer {
/**
* @param string $siteName
/**
* @param string $siteName
- * @param string $admin
+ * @param string
|null
$admin
* @param array $option
*/
function __construct( $siteName, $admin = null, array $option = [] ) {
* @param array $option
*/
function __construct( $siteName, $admin = null, array $option = [] ) {
@@
-97,7
+96,7
@@
class CliInstaller extends Installer {
$this->setVar( '_InstallUser',
$option['installdbuser'] );
$this->setVar( '_InstallPassword',
$this->setVar( '_InstallUser',
$option['installdbuser'] );
$this->setVar( '_InstallPassword',
-
isset( $option['installdbpass'] ) ? $option['installdbpass'] :
"" );
+
$option['installdbpass'] ??
"" );
// Assume that if we're given the installer user, we'll create the account.
$this->setVar( '_CreateDBAccount', true );
// Assume that if we're given the installer user, we'll create the account.
$this->setVar( '_CreateDBAccount', true );
@@
-198,7
+197,7
@@
class CliInstaller extends Installer {
if ( count( $warnings ) !== 0 ) {
foreach ( $warnings as $w ) {
if ( count( $warnings ) !== 0 ) {
foreach ( $warnings as $w ) {
-
call_user_func_array( [ $this, 'showMessage' ],
$w );
+
$this->showMessage( ...
$w );
}
}
}
}