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 "Permit case independent unit test directories"
[lhc/web/wiklou.git]
/
includes
/
installer
/
Installer.php
diff --git
a/includes/installer/Installer.php
b/includes/installer/Installer.php
index
7452b7c
..
c719c76
100644
(file)
--- a/
includes/installer/Installer.php
+++ b/
includes/installer/Installer.php
@@
-105,8
+105,6
@@
abstract class Installer {
protected static $dbTypes = [
'mysql',
'postgres',
protected static $dbTypes = [
'mysql',
'postgres',
- 'oracle',
- 'mssql',
'sqlite',
];
'sqlite',
];
@@
-761,8
+759,7
@@
abstract class Installer {
$allNames = [];
$allNames = [];
- // Messages: config-type-mysql, config-type-postgres, config-type-oracle,
- // config-type-sqlite
+ // Messages: config-type-mysql, config-type-postgres, config-type-sqlite
foreach ( self::getDBTypes() as $name ) {
$allNames[] = wfMessage( "config-type-$name" )->text();
}
foreach ( self::getDBTypes() as $name ) {
$allNames[] = wfMessage( "config-type-$name" )->text();
}
@@
-1273,7
+1270,7
@@
abstract class Installer {
*
* @param string $directory Directory to search in, relative to $IP, must be either "extensions"
* or "skins"
*
* @param string $directory Directory to search in, relative to $IP, must be either "extensions"
* or "skins"
- * @return array [ $extName => [ 'screenshots' => [ '...' ] ]
+ * @return array
[][]
[ $extName => [ 'screenshots' => [ '...' ] ]
*/
public function findExtensions( $directory = 'extensions' ) {
switch ( $directory ) {
*/
public function findExtensions( $directory = 'extensions' ) {
switch ( $directory ) {
@@
-1610,11
+1607,11
@@
abstract class Installer {
// If we've hit some sort of fatal, we need to bail.
// Callback already had a chance to do output above.
// If we've hit some sort of fatal, we need to bail.
// Callback already had a chance to do output above.
- if ( !$status->isO
k
() ) {
+ if ( !$status->isO
K
() ) {
break;
}
}
break;
}
}
- if ( $status->isO
k
() ) {
+ if ( $status->isO
K
() ) {
$this->showMessage(
'config-install-db-success'
);
$this->showMessage(
'config-install-db-success'
);