diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-25 22:16:41 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-25 22:16:41 +0100 |
| commit | 380b7d0a98f81d241208034bb76b1468485ea996 (patch) | |
| tree | c7921e8e9aa4bad8c474cf9b0c45077217e752d5 | |
| parent | bc045fd19bc859e124db0046a5d0cfdbd764f43d (diff) | |
| download | forums-380b7d0a98f81d241208034bb76b1468485ea996.tar forums-380b7d0a98f81d241208034bb76b1468485ea996.tar.gz forums-380b7d0a98f81d241208034bb76b1468485ea996.tar.bz2 forums-380b7d0a98f81d241208034bb76b1468485ea996.tar.xz forums-380b7d0a98f81d241208034bb76b1468485ea996.zip | |
[ticket/16223] Use constructor arguments instead of func_get_args()
PHPBB3-16223
| -rw-r--r-- | phpBB/phpbb/cache/driver/memcached.php | 13 | ||||
| -rw-r--r-- | tests/cache/memcached_test.php | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/phpBB/phpbb/cache/driver/memcached.php b/phpBB/phpbb/cache/driver/memcached.php index bb725adefd..fbb587a369 100644 --- a/phpBB/phpbb/cache/driver/memcached.php +++ b/phpBB/phpbb/cache/driver/memcached.php @@ -50,20 +50,15 @@ class memcached extends \phpbb\cache\driver\memory /** * Memcached constructor + * + * @param string $memcached_servers Memcached servers string (optional) */ - public function __construct() + public function __construct($memcached_servers = '') { // Call the parent constructor parent::__construct(); - $memcached_servers = PHPBB_ACM_MEMCACHED; - - // Allow overwriting PHPBB_ACM_MEMCACHED via constructor arguments - $args = func_get_args(); - if (count($args) >= 2) - { - $memcached_servers = $args[0] . '/' . $args[1]; - } + $memcached_servers = $memcached_servers ?: PHPBB_ACM_MEMCACHED; $this->memcached = new \Memcached(); $this->memcached->setOption(\Memcached::OPT_BINARY_PROTOCOL, true); diff --git a/tests/cache/memcached_test.php b/tests/cache/memcached_test.php index a29f0040cf..650b72ea18 100644 --- a/tests/cache/memcached_test.php +++ b/tests/cache/memcached_test.php @@ -59,7 +59,7 @@ class phpbb_cache_memcached_driver_test extends \phpbb_cache_common_test_case $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'); - $this->driver = new \phpbb\cache\driver\memcached(self::$config['host'], self::$config['port']); + $this->driver = new \phpbb\cache\driver\memcached(self::$config['host'] . '/' . self::$config['port']); $this->driver->purge(); } } |