mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
[ticket/12282] Use interface for type hinting
PHPBB3-12282
This commit is contained in:
@@ -106,7 +106,7 @@ interface driver_interface
|
||||
* result to persistent storage. In other words, there is no need
|
||||
* to call save() afterwards.
|
||||
*
|
||||
* @param \phpbb\db\driver\driver $db Database connection
|
||||
* @param \phpbb\db\driver\driver_interface $db Database connection
|
||||
* @param string $query SQL query, should be used for generating storage key
|
||||
* @param mixed $query_result The result from \dbal::sql_query, to be passed to
|
||||
* \dbal::sql_fetchrow to get all rows and store them
|
||||
@@ -117,7 +117,7 @@ interface driver_interface
|
||||
* representing the query should be returned. Otherwise
|
||||
* the original $query_result should be returned.
|
||||
*/
|
||||
public function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl);
|
||||
public function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, $ttl);
|
||||
|
||||
/**
|
||||
* Check if result for a given SQL query exists in cache.
|
||||
|
2
phpBB/phpbb/cache/driver/file.php
vendored
2
phpBB/phpbb/cache/driver/file.php
vendored
@@ -407,7 +407,7 @@ class file extends \phpbb\cache\driver\base
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl)
|
||||
function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, $ttl)
|
||||
{
|
||||
// Remove extra spaces and tabs
|
||||
$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
|
||||
|
2
phpBB/phpbb/cache/driver/memory.php
vendored
2
phpBB/phpbb/cache/driver/memory.php
vendored
@@ -279,7 +279,7 @@ abstract class memory extends \phpbb\cache\driver\base
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl)
|
||||
function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, $ttl)
|
||||
{
|
||||
// Remove extra spaces and tabs
|
||||
$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
|
||||
|
2
phpBB/phpbb/cache/driver/null.php
vendored
2
phpBB/phpbb/cache/driver/null.php
vendored
@@ -101,7 +101,7 @@ class null extends \phpbb\cache\driver\base
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl)
|
||||
function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, $ttl)
|
||||
{
|
||||
return $query_result;
|
||||
}
|
||||
|
6
phpBB/phpbb/cache/service.php
vendored
6
phpBB/phpbb/cache/service.php
vendored
@@ -32,7 +32,7 @@ class service
|
||||
/**
|
||||
* Database connection.
|
||||
*
|
||||
* @var \phpbb\db\driver\driver
|
||||
* @var \phpbb\db\driver\driver_interface
|
||||
*/
|
||||
protected $db;
|
||||
|
||||
@@ -55,11 +55,11 @@ class service
|
||||
*
|
||||
* @param \phpbb\cache\driver\driver_interface $driver The cache driver
|
||||
* @param \phpbb\config\config $config The config
|
||||
* @param \phpbb\db\driver\driver $db Database connection
|
||||
* @param \phpbb\db\driver\driver_interface $db Database connection
|
||||
* @param string $phpbb_root_path Root path
|
||||
* @param string $php_ext PHP extension
|
||||
*/
|
||||
public function __construct(\phpbb\cache\driver\driver_interface $driver, \phpbb\config\config $config, \phpbb\db\driver\driver $db, $phpbb_root_path, $php_ext)
|
||||
public function __construct(\phpbb\cache\driver\driver_interface $driver, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, $phpbb_root_path, $php_ext)
|
||||
{
|
||||
$this->set_driver($driver);
|
||||
$this->config = $config;
|
||||
|
Reference in New Issue
Block a user