mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
[ticket/17176] Resolve psalm issues after PHP version update
PHPBB3-17176
This commit is contained in:
@@ -1330,7 +1330,7 @@ abstract class driver implements driver_interface
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public function clean_query_id($query_id)
|
||||
public function clean_query_id(mixed $query_id): int|string
|
||||
{
|
||||
// Some DBMS functions accept/return objects and/or resources instead if identifiers
|
||||
// Attempting to use objects/resources as array keys will throw error, hence correctly handle all cases
|
||||
|
@@ -499,9 +499,9 @@ interface driver_interface
|
||||
/**
|
||||
* Ensure query ID can be used by cache
|
||||
*
|
||||
* @param resource|int|string $query_id Mixed type query id
|
||||
* @param mixed $query_id Mixed type query id
|
||||
*
|
||||
* @return int|string Query id in string or integer format
|
||||
*/
|
||||
public function clean_query_id($query_id);
|
||||
public function clean_query_id(mixed $query_id): int|string;
|
||||
}
|
||||
|
@@ -478,7 +478,7 @@ class factory implements driver_interface
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public function clean_query_id($query_id)
|
||||
public function clean_query_id(mixed $query_id): int|string
|
||||
{
|
||||
return $this->get_driver()->clean_query_id($query_id);
|
||||
}
|
||||
|
@@ -432,7 +432,7 @@ class postgres extends \phpbb\db\driver\driver
|
||||
protected function _sql_close(): bool
|
||||
{
|
||||
// Released resources are already closed, return true in this case
|
||||
if (!is_resource($this->db_connect_id))
|
||||
if (!$this->db_connect_id instanceof \PgSql\Connection)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user