mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 19:54:12 +02:00
Code Issues Releases Wiki Activity

[ticket/17142] Fix DBMS+cache related PHP warnings while installing

Browse Source 
PHPBB3-17142
This commit is contained in:
rxu
2023-06-08 00:05:48 +07:00
parent 75dcbeaa9f
commit 7adee3c50d
10 changed files with 115 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/phpbb/cache/driver/base.php vendored
View File

@@ -115,6 +115,7 @@ abstract class base implements \phpbb\cache\driver\driver_interface
*/
function sql_exists($query_id)
{
$query_id = $this->clean_query_id($query_id);
return isset($this->sql_rowset[$query_id]);
}
@@ -123,6 +124,7 @@ abstract class base implements \phpbb\cache\driver\driver_interface
*/
function sql_fetchrow($query_id)
{
$query_id = $this->clean_query_id($query_id);
if ($this->sql_row_pointer[$query_id] < count($this->sql_rowset[$query_id]))
{
return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
@@ -136,6 +138,7 @@ abstract class base implements \phpbb\cache\driver\driver_interface
*/
function sql_fetchfield($query_id, $field)
{
$query_id = $this->clean_query_id($query_id);
if ($this->sql_row_pointer[$query_id] < count($this->sql_rowset[$query_id]))
{
return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++][$field] : false;
@@ -149,6 +152,7 @@ abstract class base implements \phpbb\cache\driver\driver_interface
*/
function sql_rowseek($rownum, $query_id)
{
$query_id = $this->clean_query_id($query_id);
if ($rownum >= count($this->sql_rowset[$query_id]))
{
return false;
@@ -163,6 +167,7 @@ abstract class base implements \phpbb\cache\driver\driver_interface
*/
function sql_freeresult($query_id)
{
$query_id = $this->clean_query_id($query_id);
if (!isset($this->sql_rowset[$query_id]))
{
return false;
@@ -231,4 +236,21 @@ abstract class base implements \phpbb\cache\driver\driver_interface
@rmdir($dir);
}
/**
* {@inheritDoc}
*/
public function clean_query_id($query_id)
{
// Some DBMS functions accept/return objects and/or resources instead of integer identifier
// Attempting to cast object to int will throw error, hence correctly handle all cases
if (is_resource($query_id))
{
return function_exists('get_resource_id') ? get_resource_id($query_id) : (int) $query_id;
}
else
{
return is_object($query_id) ? spl_object_id($query_id) : $query_id;
}
}
}

9
phpBB/phpbb/cache/driver/driver_interface.php vendored
View File

@@ -164,4 +164,13 @@ interface driver_interface
* @return bool
*/
public function sql_freeresult($query_id);
/**
* Ensure query ID can be used by cache
*
* @param object|resource|int|string $query_id Mixed type query id
*
* @return int|string Query id in string or integer format
*/
public function clean_query_id($query_id);
}