update.php: Run checkComposerLockUpToDate.php

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

diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 136ca4b..351b022 100644 (file)
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -50,7 +50,7 @@ class SqliteInstaller extends DatabaseInstaller {
 
        /**
         *
-        * @return Status:
+        * @return Status
         */
        public function checkPrerequisites() {
                $result = Status::newGood();
@@ -82,14 +82,23 @@ class SqliteInstaller extends DatabaseInstaller {
        }
 
        public function getConnectForm() {
-               return $this->getTextBox( 'wgSQLiteDataDir', 'config-sqlite-dir', array(), $this->parent->getHelpBox( 'config-sqlite-dir-help' ) ) .
-                       $this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-sqlite-name-help' ) );
+               return $this->getTextBox(
+                       'wgSQLiteDataDir',
+                       'config-sqlite-dir', array(),
+                       $this->parent->getHelpBox( 'config-sqlite-dir-help' )
+               ) .
+               $this->getTextBox(
+                       'wgDBname',
+                       'config-db-name',
+                       array(),
+                       $this->parent->getHelpBox( 'config-sqlite-name-help' )
+               );
        }
 
        /**
         * Safe wrapper for PHP's realpath() that fails gracefully if it's unable to canonicalize the path.
         *
-        * @param $path string
+        * @param string $path
         *
         * @return string
         */
@@ -123,8 +132,8 @@ class SqliteInstaller extends DatabaseInstaller {
        }
 
        /**
-        * @param $dir
-        * @param $create bool
+        * @param string $dir
+        * @param bool $create
         * @return Status
         */
        private static function dataDirOKmaybeCreate( $dir, $create = false ) {
@@ -132,9 +141,16 @@ class SqliteInstaller extends DatabaseInstaller {
                        if ( !is_writable( dirname( $dir ) ) ) {
                                $webserverGroup = Installer::maybeGetWebserverPrimaryGroup();
                                if ( $webserverGroup !== null ) {
-                                       return Status::newFatal( 'config-sqlite-parent-unwritable-group', $dir, dirname( $dir ), basename( $dir ), $webserverGroup );
+                                       return Status::newFatal(
+                                               'config-sqlite-parent-unwritable-group',
+                                               $dir, dirname( $dir ), basename( $dir ),
+                                               $webserverGroup
+                                       );
                                } else {
-                                       return Status::newFatal( 'config-sqlite-parent-unwritable-nogroup', $dir, dirname( $dir ), basename( $dir ) );
+                                       return Status::newFatal(
+                                               'config-sqlite-parent-unwritable-nogroup',
+                                               $dir, dirname( $dir ), basename( $dir )
+                                       );
                                }
                        }
 
@@ -239,7 +255,7 @@ class SqliteInstaller extends DatabaseInstaller {
        }
 
        /**
-        * @param $status Status
+        * @param Status $status
         * @return Status
         */
        public function setupSearchIndex( &$status ) {