1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 09:46:46 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2019-11-27 08:10:49 +01:00
11 changed files with 128 additions and 129 deletions

View File

@@ -109,6 +109,21 @@ Or via environment variables as follows:
$ PHPBB_TEST_REDIS_HOST=localhost PHPBB_TEST_REDIS_PORT=6379 phpunit
Memcached
---------
In order to run tests for the memcached cache driver, at least one of memcached
host or port must be specified in the test configuration. This can be done via
test_config.php as follows:
<?php
$phpbb_memcached_host = 'localhost';
$phpbb_memcached_port = '11211';
Or via environment variables as follows:
$ PHPBB_TEST_MEMCACHED_HOST=localhost PHPBB_TEST_MEMCACHED_PORT=11211 phpunit
Running
=======

65
tests/cache/memcached_test.php vendored Normal file
View File

@@ -0,0 +1,65 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require_once dirname(__FILE__) . '/common_test_case.php';
class phpbb_cache_memcached_driver_test extends \phpbb_cache_common_test_case
{
protected static $config;
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
}
static public function setUpBeforeClass()
{
if (!extension_loaded('memcached'))
{
self::markTestSkipped('memcached extension is not loaded');
}
$config = phpbb_test_case_helpers::get_test_config();
if (isset($config['memcached_host']) || isset($config['memcached_port']))
{
$host = isset($config['memcached_host']) ? $config['memcached_host'] : 'localhost';
$port = isset($config['memcached_port']) ? $config['memcached_port'] : 11211;
self::$config = array('host' => $host, 'port' => $port);
}
else
{
self::markTestSkipped('Test memcached host/port is not specified');
}
$memcached = new \Memcached();
$memcached->addServer(self::$config['host'], self::$config['port']);
if (empty($memcached->getStats()))
{
self::markTestSkipped('Test memcached server is not available');
}
parent::setUpBeforeClass();
}
protected function setUp(): void
{
global $phpbb_root_path, $phpbb_container;
parent::setUp();
$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->purge();
}
}

View File

@@ -173,6 +173,16 @@ class phpbb_test_case_helpers
{
$config['fulltext_sphinx_id'] = $fulltext_sphinx_id;
}
if (isset($phpbb_memcached_host))
{
$config['memcached_host'] = $phpbb_memcached_host;
}
if (isset($phpbb_memcached_port))
{
$config['memcached_port'] = $phpbb_memcached_port;
}
}
if (isset($_SERVER['PHPBB_TEST_DBMS']))
@@ -205,6 +215,16 @@ class phpbb_test_case_helpers
$config['redis_port'] = $_SERVER['PHPBB_TEST_REDIS_PORT'];
}
if (isset($_SERVER['PHPBB_TEST_MEMCACHED_HOST']))
{
$config['memcached_host'] = $_SERVER['PHPBB_TEST_MEMCACHED_HOST'];
}
if (isset($_SERVER['PHPBB_TEST_MEMCACHED_PORT']))
{
$config['memcached_port'] = $_SERVER['PHPBB_TEST_MEMCACHED_PORT'];
}
return $config;
}