Merge "Avoid an infinite redirect in $wgSecureLogin handling"

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

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 4c72528..10f6692 100644 (file)
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -65,7 +65,7 @@ class MysqlInstaller extends DatabaseInstaller {
        }
 
        /**
-        * @return Bool
+        * @return bool
         */
        public function isCompiled() {
                return self::checkExtension( 'mysql' ) || self::checkExtension( 'mysqli' );
@@ -603,7 +603,7 @@ class MysqlInstaller extends DatabaseInstaller {
         * Return a formal 'User'@'Host' username for use in queries
         * @param string $name Username, quotes will be added
         * @param string $host Hostname, quotes will be added
-        * @return String
+        * @return string
         */
        private function buildFullUserName( $name, $host ) {
                return $this->db->addQuotes( $name ) . '@' . $this->db->addQuotes( $host );
@@ -614,7 +614,7 @@ class MysqlInstaller extends DatabaseInstaller {
         * access to mysql.user, so false means "no" or "maybe"
         * @param string $host Hostname to check
         * @param string $user Username to check
-        * @return boolean
+        * @return bool
         */
        private function userDefinitelyExists( $host, $user ) {
                try {
@@ -631,7 +631,7 @@ class MysqlInstaller extends DatabaseInstaller {
         * Return any table options to be applied to all tables that don't
         * override them.
         *
-        * @return String
+        * @return string
         */
        protected function getTableOptions() {
                $options = array();