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 "MemoizedCallable: Add test for memoized closure"
[lhc/web/wiklou.git]
/
includes
/
installer
/
OracleInstaller.php
diff --git
a/includes/installer/OracleInstaller.php
b/includes/installer/OracleInstaller.php
index
9e692ea
..
8610834
100644
(file)
--- a/
includes/installer/OracleInstaller.php
+++ b/
includes/installer/OracleInstaller.php
@@
-29,19
+29,19
@@
*/
class OracleInstaller extends DatabaseInstaller {
*/
class OracleInstaller extends DatabaseInstaller {
- protected $globalNames =
array(
+ protected $globalNames =
[
'wgDBserver',
'wgDBname',
'wgDBuser',
'wgDBpassword',
'wgDBprefix',
'wgDBserver',
'wgDBname',
'wgDBuser',
'wgDBpassword',
'wgDBprefix',
-
)
;
+
]
;
- protected $internalDefaults =
array(
+ protected $internalDefaults =
[
'_OracleDefTS' => 'USERS',
'_OracleTempTS' => 'TEMP',
'_InstallUser' => 'SYSTEM',
'_OracleDefTS' => 'USERS',
'_OracleTempTS' => 'TEMP',
'_InstallUser' => 'SYSTEM',
-
)
;
+
]
;
public $minimumVersion = '9.0.1'; // 9iR1
public $minimumVersion = '9.0.1'; // 9iR1
@@
-63,17
+63,17
@@
class OracleInstaller extends DatabaseInstaller {
return $this->getTextBox(
'wgDBserver',
'config-db-host-oracle',
return $this->getTextBox(
'wgDBserver',
'config-db-host-oracle',
-
array()
,
+
[]
,
$this->parent->getHelpBox( 'config-db-host-oracle-help' )
) .
Html::openElement( 'fieldset' ) .
$this->parent->getHelpBox( 'config-db-host-oracle-help' )
) .
Html::openElement( 'fieldset' ) .
- Html::element( 'legend',
array()
, wfMessage( 'config-db-wiki-settings' )->text() ) .
+ Html::element( 'legend',
[]
, wfMessage( 'config-db-wiki-settings' )->text() ) .
$this->getTextBox( 'wgDBprefix', 'config-db-prefix' ) .
$this->getTextBox( '_OracleDefTS', 'config-oracle-def-ts' ) .
$this->getTextBox(
'_OracleTempTS',
'config-oracle-temp-ts',
$this->getTextBox( 'wgDBprefix', 'config-db-prefix' ) .
$this->getTextBox( '_OracleDefTS', 'config-oracle-def-ts' ) .
$this->getTextBox(
'_OracleTempTS',
'config-oracle-temp-ts',
-
array()
,
+
[]
,
$this->parent->getHelpBox( 'config-db-oracle-help' )
) .
Html::closeElement( 'fieldset' ) .
$this->parent->getHelpBox( 'config-db-oracle-help' )
) .
Html::closeElement( 'fieldset' ) .
@@
-91,12
+91,12
@@
class OracleInstaller extends DatabaseInstaller {
public function submitConnectForm() {
// Get variables from the request
public function submitConnectForm() {
// Get variables from the request
- $newValues = $this->setVarsFromRequest(
array(
+ $newValues = $this->setVarsFromRequest(
[
'wgDBserver',
'wgDBprefix',
'wgDBuser',
'wgDBpassword'
'wgDBserver',
'wgDBprefix',
'wgDBuser',
'wgDBpassword'
-
)
);
+
]
);
$this->parent->setVar( 'wgDBname', $this->getVar( 'wgDBuser' ) );
// Validate them
$this->parent->setVar( 'wgDBname', $this->getVar( 'wgDBuser' ) );
// Validate them
@@
-214,10
+214,10
@@
class OracleInstaller extends DatabaseInstaller {
public function preInstall() {
# Add our user callback to installSteps, right before the tables are created.
public function preInstall() {
# Add our user callback to installSteps, right before the tables are created.
- $callback =
array(
+ $callback =
[
'name' => 'user',
'name' => 'user',
- 'callback' =>
array( $this, 'setupUser' )
-
)
;
+ 'callback' =>
[ $this, 'setupUser' ]
+
]
;
$this->parent->addInstallStep( $callback, 'database' );
}
$this->parent->addInstallStep( $callback, 'database' );
}
@@
-293,7
+293,7
@@
class OracleInstaller extends DatabaseInstaller {
}
public function getSchemaVars() {
}
public function getSchemaVars() {
- $varNames =
array(
+ $varNames =
[
# These variables are used by maintenance/oracle/user.sql
'_OracleDefTS',
'_OracleTempTS',
# These variables are used by maintenance/oracle/user.sql
'_OracleDefTS',
'_OracleTempTS',
@@
-302,8
+302,8
@@
class OracleInstaller extends DatabaseInstaller {
# These are used by tables.sql
'wgDBprefix',
# These are used by tables.sql
'wgDBprefix',
-
)
;
- $vars =
array()
;
+
]
;
+ $vars =
[]
;
foreach ( $varNames as $name ) {
$vars[$name] = $this->getVar( $name );
}
foreach ( $varNames as $name ) {
$vars[$name] = $this->getVar( $name );
}