From 1f2c0b98b5957aee25d08f1d85c7fdcc28b1e05e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 20 Jul 2018 22:04:43 -0400 Subject: [PATCH] Rename DBA::server_info to DBA::serverInfo --- src/Database/DBA.php | 4 ++-- src/Database/DBStructure.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Database/DBA.php b/src/Database/DBA.php index 40699feac0..7bf38c9b7b 100644 --- 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 2637cf99e2..ac803761ac 100644 --- 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';