makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15201] Fix tests

Browse source 
PHPBB3-15201
This commit is contained in:
Rubén Calvo 2017-09-08 10:59:47 +02:00
parent 13b0f39961
commit 4b1ec6abb7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
View file

@ -160,7 +160,7 @@ class style_update_p1 extends \phpbb\db\migration\migration
FROM ' . STYLES_TABLE . " FROM ' . STYLES_TABLE . "
WHERE style_name = 'prosilver'"; WHERE style_name = 'prosilver'";
$result = $this->sql_query($sql); $result = $this->sql_query($sql);
$default_style = $this->db->sql_fetchfield('style_id'); $default_style = (int) $this->db->sql_fetchfield('style_id');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$this->config->set('default_style', $default_style); $this->config->set('default_style', $default_style);
@ -184,7 +184,7 @@ class style_update_p1 extends \phpbb\db\migration\migration
// Reset styles for users // Reset styles for users
$this->sql_query('UPDATE ' . USERS_TABLE . " $this->sql_query('UPDATE ' . USERS_TABLE . "
SET user_style = '" . $valid_styles[0] . "' SET user_style = '" . (int) $valid_styles[0] . "'
WHERE " . $this->db->sql_in_set('user_style', $valid_styles, true)); WHERE " . $this->db->sql_in_set('user_style', $valid_styles, true));
} }
} }

3
tests/test_framework/phpbb_functional_test_case.php
View file

@ -572,6 +572,9 @@ class phpbb_functional_test_case extends phpbb_test_case
$config['rand_seed'] = ''; $config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600; $config['rand_seed_last_update'] = time() + 600;
// Prevent new user to have an invalid style
$config['default_style'] = 1;
// Required by user_add // Required by user_add
global $db, $cache, $phpbb_dispatcher, $phpbb_container; global $db, $cache, $phpbb_dispatcher, $phpbb_container;
$db = $this->get_db(); $db = $this->get_db();