1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

Conflicts:
	phpBB/docs/hook_system.html
This commit is contained in:
Yuriy Rusko
2014-05-27 21:55:40 +02:00
39 changed files with 507 additions and 2465 deletions

View File

@@ -13,8 +13,8 @@
class phpbb_config_db_text_test extends phpbb_database_test_case
{
private $db;
private $config_text;
/** @var \phpbb\config\db_text */
protected $config_text;
public function getDataSet()
{
@@ -52,6 +52,12 @@ class phpbb_config_db_text_test extends phpbb_database_test_case
$this->assertSame('24', $this->config_text->get('foo'));
}
public function test_set_same_value_get()
{
$this->config_text->set('foo', '23');
$this->assertSame('23', $this->config_text->get('foo'));
}
public function test_set_get_long_string()
{
$expected = str_repeat('ABC', 10000);
@@ -93,6 +99,8 @@ class phpbb_config_db_text_test extends phpbb_database_test_case
'baby' => 'phpBB',
// Entry update
'bar' => '64',
// Entry update - same value
'foo' => '23',
);
$this->config_text->set_array($set_array_param);