extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

PHP 8 fix: adding explicit cast for comparing DB-version to a float major number

Browse Source
This commit is contained in:
Ralf Becker 2021-03-31 13:31:42 +02:00
parent 11d441e689
commit 37e5e12c3c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Contacts/Sql.php
View File

@ -419,7 +419,7 @@ class Sql extends Api\Storage
); );
$columns = implode(', ', $group); $columns = implode(', ', $group);
if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0) if ($this->db->Type == 'mysql' && (float)$this->db->ServerInfo['version'] >= 4.0)
{ {
$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS '; $mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
} }

6
api/src/Db.php
View File

@ -538,7 +538,7 @@ class Db
$this->set_capabilities($Type,$this->ServerInfo['version']); $this->set_capabilities($Type,$this->ServerInfo['version']);
// switch off MySQL 5.7+ ONLY_FULL_GROUP_BY sql_mode // switch off MySQL 5.7+ ONLY_FULL_GROUP_BY sql_mode
if (substr($this->Type, 0, 5) == 'mysql' && $this->ServerInfo['version'] >= 5.7 && $this->ServerInfo['version'] < 10.0) if (substr($this->Type, 0, 5) == 'mysql' && (float)$this->ServerInfo['version'] >= 5.7 && (float)$this->ServerInfo['version'] < 10.0)
{ {
$this->query("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))", __LINE__, __FILE__); $this->query("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))", __LINE__, __FILE__);
} }
@ -661,7 +661,7 @@ class Db
case 'maxdb': // if Lim ever changes it to maxdb ;-) case 'maxdb': // if Lim ever changes it to maxdb ;-)
case 'sapdb': case 'sapdb':
$this->capabilities[self::CAPABILITY_DISTINCT_ON_TEXT] = false; $this->capabilities[self::CAPABILITY_DISTINCT_ON_TEXT] = false;
$this->capabilities[self::CAPABILITY_LIKE_ON_TEXT] = $db_version >= 7.6; $this->capabilities[self::CAPABILITY_LIKE_ON_TEXT] = (float)$db_version >= 7.6;
$this->capabilities[self::CAPABILITY_ORDER_ON_TEXT] = false; $this->capabilities[self::CAPABILITY_ORDER_ON_TEXT] = false;
break; break;
} }
@ -1228,7 +1228,7 @@ class Db
break; break;
case 'pgsql': // requires for Postgresql < 8.4 to have a custom ARRAY_AGG method installed! case 'pgsql': // requires for Postgresql < 8.4 to have a custom ARRAY_AGG method installed!
if ($this->Type == 'pgsql' && $this->ServerInfo['version'] < 8.4) if ($this->Type == 'pgsql' && (float)$this->ServerInfo['version'] < 8.4)
{ {
return false; return false;
} }

2
api/src/Db/Pdo.php
View File

@ -105,7 +105,7 @@ class Pdo
case 'mysql': case 'mysql':
$dsn .= ';charset=utf8'; $dsn .= ';charset=utf8';
// switch off MySQL 5.7+ ONLY_FULL_GROUP_BY sql_mode // switch off MySQL 5.7+ ONLY_FULL_GROUP_BY sql_mode
if ($egw_db->ServerInfo['version'] >= 5.7 && $egw_db->ServerInfo['version'] < 10.0) if ((float)$egw_db->ServerInfo['version'] >= 5.7 && (float)$egw_db->ServerInfo['version'] < 10.0)
{ {
$query = "SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))"; $query = "SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))";
} }

4
api/src/Storage/Base.php
View File

@ -1002,7 +1002,7 @@ class Base
// running the union query now // running the union query now
if ($start !== false) // need to get the total too, saved in $this->total if ($start !== false) // need to get the total too, saved in $this->total
{ {
if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0) if ($this->db->Type == 'mysql' && (float)$this->db->ServerInfo['version'] >= 4.0)
{ {
$union[0]['cols'] = ($mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ').$union[0]['cols']; $union[0]['cols'] = ($mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ').$union[0]['cols'];
} }
@ -1021,7 +1021,7 @@ class Base
{ {
if ($start !== false) // need to get the total too, saved in $this->total if ($start !== false) // need to get the total too, saved in $this->total
{ {
if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0) if ($this->db->Type == 'mysql' && (float)$this->db->ServerInfo['version'] >= 4.0)
{ {
$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS '; $mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
} }

2
infolog/inc/class.infolog_so.inc.php
View File

@ -946,7 +946,7 @@ class infolog_so
$sql_query = "FROM $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra"; $sql_query = "FROM $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
#error_log("infolog.so.search:\n" . print_r($sql_query, true)); #error_log("infolog.so.search:\n" . print_r($sql_query, true));
if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0) if ($this->db->Type == 'mysql' && (float)$this->db->ServerInfo['version'] >= 4.0)
{ {
$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS '; $mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
unset($query['total']); unset($query['total']);