Rename DBA::server_info to DBA::serverInfo

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 40699feac031439209d19a9bf6a5409faffd1ba3..7bf38c9b7b355097b62623eea2a0a20832290192 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -164,7 +164,7 @@ class DBA
         *
         * @return string
         */
-       public static function server_info() {
+       public static function serverInfo() {
                if (self::$server_info == '') {
                        switch (self::$driver) {
                                case 'pdo':
@@ -289,7 +289,7 @@ class DBA
         * @return string The input SQL string modified if necessary.
         */
        public static function anyValueFallback($sql) {
-               $server_info = self::server_info();
+               $server_info = self::serverInfo();
                if (version_compare($server_info, '5.7.5', '<') ||
                        (stripos($server_info, 'MariaDB') !== false)) {
                        $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 2637cf99e272994fe10c02b7c19b47b12c8d7f72..ac803761acd16bb242fd6a0a04da36e2206ae469 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -236,8 +236,8 @@ class DBStructure
                }
 
                // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
-               if ((version_compare(DBA::server_info(), '5.7.4') >= 0) &&
-                       !(strpos(DBA::server_info(), 'MariaDB') !== false)) {
+               if ((version_compare(DBA::serverInfo(), '5.7.4') >= 0) &&
+                       !(strpos(DBA::serverInfo(), 'MariaDB') !== false)) {
                        $ignore = '';
                } else {
                        $ignore = ' IGNORE';