Merge "Allow minor edits to be filtered out of Special:Contributions"

[lhc/web/wiklou.git] / includes / installer / SqliteInstaller.php

diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 43b809c..d59c162 100644 (file)
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -35,10 +35,10 @@ class SqliteInstaller extends DatabaseInstaller {
         */
        public $db;
 
-       protected $globalNames = array(
+       protected $globalNames = [
                'wgDBname',
                'wgSQLiteDataDir',
-       );
+       ];
 
        public function getName() {
                return 'sqlite';
@@ -71,7 +71,7 @@ class SqliteInstaller extends DatabaseInstaller {
                $defaults = parent::getGlobalDefaults();
                if ( isset( $_SERVER['DOCUMENT_ROOT'] ) ) {
                        $path = str_replace(
-                               array( '/', '\\' ),
+                               [ '/', '\\' ],
                                DIRECTORY_SEPARATOR,
                                dirname( $_SERVER['DOCUMENT_ROOT'] ) . '/data'
                        );
@@ -84,13 +84,13 @@ class SqliteInstaller extends DatabaseInstaller {
        public function getConnectForm() {
                return $this->getTextBox(
                        'wgSQLiteDataDir',
-                       'config-sqlite-dir', array(),
+                       'config-sqlite-dir', [],
                        $this->parent->getHelpBox( 'config-sqlite-dir-help' )
                ) .
                $this->getTextBox(
                        'wgDBname',
                        'config-db-name',
-                       array(),
+                       [],
                        $this->parent->getHelpBox( 'config-sqlite-name-help' )
                );
        }
@@ -115,7 +115,7 @@ class SqliteInstaller extends DatabaseInstaller {
         * @return Status
         */
        public function submitConnectForm() {
-               $this->setVarsFromRequest( array( 'wgSQLiteDataDir', 'wgDBname' ) );
+               $this->setVarsFromRequest( [ 'wgSQLiteDataDir', 'wgDBname' ] );
 
                # Try realpath() if the directory already exists
                $dir = self::realpath( $this->getVar( 'wgSQLiteDataDir' ) );
@@ -188,7 +188,7 @@ class SqliteInstaller extends DatabaseInstaller {
                        # @todo FIXME: Need more sensible constructor parameters, e.g. single associative array
                        # Setting globals kind of sucks
                        $wgSQLiteDataDir = $dir;
-                       $db = DatabaseBase::factory( 'sqlite', array( 'dbname' => $dbName ) );
+                       $db = DatabaseBase::factory( 'sqlite', [ 'dbname' => $dbName ] );
                        $status->value = $db;
                } catch ( DBConnectionError $e ) {
                        $status->fatal( 'config-sqlite-connection-error', $e->getMessage() );
@@ -246,7 +246,7 @@ class SqliteInstaller extends DatabaseInstaller {
                        global $wgSQLiteDataDir;
                        # @todo FIXME: setting globals kind of sucks
                        $wgSQLiteDataDir = $dir;
-                       $conn = DatabaseBase::factory( 'sqlite', array( 'dbname' => "wikicache" ) );
+                       $conn = DatabaseBase::factory( 'sqlite', [ 'dbname' => "wikicache" ] );
                        # @todo: don't duplicate objectcache definition, though it's very simple
                        $sql =
 <<<EOT
@@ -319,15 +319,15 @@ EOT;
 
                return "# SQLite-specific settings
 \$wgSQLiteDataDir = \"{$dir}\";
-\$wgObjectCaches[CACHE_DB] = array(
+\$wgObjectCaches[CACHE_DB] = [
        'class' => 'SqlBagOStuff',
        'loggroup' => 'SQLBagOStuff',
-       'server' => array(
+       'server' => [
                'type' => 'sqlite',
                'dbname' => 'wikicache',
                'tablePrefix' => '',
                'flags' => 0
-       )
-);";
+       ]
+];";
        }
 }