makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9687] Fix code style and tests

Browse source 
PHPBB3-9687
This commit is contained in:
Oliver Schramm 2018-10-01 23:40:15 +02:00 • committed by Marc Alexander
parent 64ab1fc24c
commit e7015bf1dd
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
17 changed files with 78 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_user.php
View file

@ -749,7 +749,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
$db->sql_query($sql); $db->sql_query($sql);
// Delete the user_id from the banlist // Delete the user_id from the banlist
$sql = 'DELETE FROM ' . BAN_TABLE . ' $sql = 'DELETE FROM ' . BANS_TABLE . '
WHERE ban_mode = \'user\' AND ' . $db->sql_in_set('ban_item', $user_ids); WHERE ban_mode = \'user\' AND ' . $db->sql_in_set('ban_item', $user_ids);
$db->sql_query($sql); $db->sql_query($sql);

3
phpBB/phpbb/ban/manager.php
View file

@ -15,7 +15,6 @@ namespace phpbb\ban;
use phpbb\ban\exception\ban_insert_failed_exception; use phpbb\ban\exception\ban_insert_failed_exception;
use phpbb\ban\exception\invalid_length_exception; use phpbb\ban\exception\invalid_length_exception;
use phpbb\ban\exception\no_items_specified_exception;
use phpbb\ban\exception\type_not_found_exception; use phpbb\ban\exception\type_not_found_exception;
class manager class manager
@ -189,7 +188,7 @@ class manager
$user_ids = []; $user_ids = [];
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
$user_ids[] = (int)$row['user_id']; $user_ids[] = (int) $row['user_id'];
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
} }

2
phpBB/phpbb/ban/type/base.php
View file

@ -95,7 +95,7 @@ abstract class base implements type_interface
} }
$this->excluded = [ $this->excluded = [
(int)$this->user->data['user_id'] => $this->user->data[$user_column], (int) $this->user->data['user_id'] => $this->user->data[$user_column],
]; ];
$sql = "SELECT user_id, {$user_column} $sql = "SELECT user_id, {$user_column}

1
phpBB/phpbb/ban/type/email.php
View file

@ -14,7 +14,6 @@
namespace phpbb\ban\type; namespace phpbb\ban\type;
use phpbb\ban\exception\no_valid_emails_exception; use phpbb\ban\exception\no_valid_emails_exception;
use phpbb\ban\exception\no_valid_users_exception;
use phpbb\exception\runtime_exception; use phpbb\exception\runtime_exception;
class email extends base class email extends base

2
phpBB/phpbb/ban/type/type_interface.php
View file

@ -13,8 +13,6 @@
namespace phpbb\ban\type; namespace phpbb\ban\type;
use phpbb\mimetype\null_guesser;
/** /**
* Interface implemented by all ban types * Interface implemented by all ban types
*/ */

2
phpBB/phpbb/db/migration/data/v330/ban_table_p1.php
View file

@ -148,7 +148,7 @@ class ban_table_p1 extends \phpbb\db\migration\migration
$processed_rows++; $processed_rows++;
$bans[] = [ $bans[] = [
'ban_userid' => ($row['ban_mode'] === 'user') ? (int)$row['ban_item'] : 0, 'ban_userid' => ($row['ban_mode'] === 'user') ? (int) $row['ban_item'] : 0,
'ban_ip' => ($row['ban_mode'] === 'ip') ? $row['ban_item'] : '', 'ban_ip' => ($row['ban_mode'] === 'ip') ? $row['ban_item'] : '',
'ban_email' => ($row['ban_mode'] === 'email') ? $row['ban_item'] : '', 'ban_email' => ($row['ban_mode'] === 'email') ? $row['ban_item'] : '',
'ban_start' => $row['ban_start'], 'ban_start' => $row['ban_start'],

2
phpBB/phpbb/db/migration/data/v330/ban_table_p2.php
View file

@ -35,7 +35,7 @@ class ban_table_p2 extends \phpbb\db\migration\migration
'add_tables' => array( 'add_tables' => array(
$this->table_prefix . 'banlist' => array( $this->table_prefix . 'banlist' => array(
'COLUMNS' => array( 'COLUMNS' => array(
'ban_id' => array('ULINT', NULL, 'auto_increment'), 'ban_id' => array('ULINT', null, 'auto_increment'),
'ban_userid' => array('ULINT', 0), 'ban_userid' => array('ULINT', 0),
'ban_ip' => array('VCHAR:40', ''), 'ban_ip' => array('VCHAR:40', ''),
'ban_email' => array('VCHAR_UNI:100', ''), 'ban_email' => array('VCHAR_UNI:100', ''),

9
tests/dbal/boolean_processor_test.php
View file

@ -153,9 +153,9 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
'LEFT_JOIN' => array( 'LEFT_JOIN' => array(
array( array(
'FROM' => array( 'FROM' => array(
'phpbb_banlist' => 'b', 'phpbb_bans' => 'b',
), ),
'ON' => 'u.user_id = b.ban_userid', 'ON' => 'b.ban_item = ' . $db->cast_expr_to_string('u.user_id'),
), ),
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',
@ -172,6 +172,7 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
array( array(
array('ug.group_id', '=', 1), array('ug.group_id', '=', 1),
array('b.ban_id', 'IS_NOT', NULL), array('b.ban_id', 'IS_NOT', NULL),
array('b.ban_mode', '=', "'user'"),
), ),
), ),
), ),
@ -290,9 +291,9 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
'LEFT_JOIN' => array( 'LEFT_JOIN' => array(
array( array(
'FROM' => array( 'FROM' => array(
'phpbb_banlist' => 'b', 'phpbb_bans' => 'b',
), ),
'ON' => 'u.user_id = b.ban_userid', 'ON' => 'b.ban_item = ' . $db->cast_expr_to_string('u.user_id'),
), ),
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',

4
tests/dbal/cross_join_test.php
View file

@ -36,9 +36,9 @@ class phpbb_dbal_cross_join_test extends phpbb_database_test_case
'LEFT_JOIN' => array( 'LEFT_JOIN' => array(
array( array(
'FROM' => array( 'FROM' => array(
'phpbb_banlist' => 'b', 'phpbb_bans' => 'b',
), ),
'ON' => 'u.user_id = b.ban_userid', 'ON' => 'b.ban_item = ' . $db->cast_expr_to_string('u.user_id'),
), ),
), ),
'WHERE' => 'ug.group_id = 1 'WHERE' => 'ug.group_id = 1

6
tests/dbal/fixtures/boolean_processor.xml
View file

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<dataset> <dataset>
<table name="phpbb_banlist"> <table name="phpbb_bans">
<column>ban_id</column> <column>ban_id</column>
<column>ban_userid</column> <column>ban_mode</column>
<column>ban_item</column>
<row> <row>
<value>1</value> <value>1</value>
<value>user</value>
<value>2</value> <value>2</value>
</row> </row>
</table> </table>

6
tests/dbal/fixtures/massmail_crossjoin.xml
View file

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<dataset> <dataset>
<table name="phpbb_banlist"> <table name="phpbb_bans">
<column>ban_id</column> <column>ban_id</column>
<column>ban_userid</column> <column>ban_mode</column>
<column>ban_item</column>
<row> <row>
<value>1</value> <value>1</value>
<value>user</value>
<value>2</value> <value>2</value>
</row> </row>
</table> </table>

2
tests/functions/fixtures/banned_users.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<dataset> <dataset>
<table name="phpbb_banlist"> <table name="phpbb_bans">
<column>ban_userid</column> <column>ban_userid</column>
<column>ban_exclude</column> <column>ban_exclude</column>
<column>ban_end</column> <column>ban_end</column>

2
tests/functions_user/delete_user_test.php
View file

@ -369,7 +369,7 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$sql = 'SELECT ban_id $sql = 'SELECT ban_id
FROM ' . BANLIST_TABLE . ' FROM ' . BANS_TABLE . '
ORDER BY ban_id ASC'; ORDER BY ban_id ASC';
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$this->assertEquals($expected_ban, $this->db->sql_fetchrowset($result), 'Ban table content is mismatching after deleting a user.'); $this->assertEquals($expected_ban, $this->db->sql_fetchrowset($result), 'Ban table content is mismatching after deleting a user.');

42
tests/functions_user/fixtures/delete_user.xml
View file

@ -36,31 +36,39 @@
<value></value> <value></value>
</row> </row>
</table> </table>
<table name="phpbb_banlist"> <table name="phpbb_bans">
<column>ban_id</column> <column>ban_id</column>
<column>ban_userid</column> <column>ban_mode</column>
<column>ban_email</column> <column>ban_item</column>
<column>ban_start</column>
<column>ban_end</column>
<column>ban_reason</column> <column>ban_reason</column>
<column>ban_give_reason</column> <column>ban_reason_display</column>
<row> <row>
<value>1</value> <value>1</value>
<value>user</value>
<value>2</value> <value>2</value>
<value></value> <value>0</value>
<value></value>
<value></value>
</row>
<row>
<value>2</value>
<value>3</value>
<value></value>
<value></value>
<value></value>
</row>
<row>
<value>3</value>
<value>0</value> <value>0</value>
<value></value> <value></value>
<value></value> <value></value>
</row>
<row>
<value>2</value>
<value>user</value>
<value>3</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value>
</row>
<row>
<value>3</value>
<value>user</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value> <value></value>
</row> </row>
</table> </table>

4
tests/session/check_ban_test.php
View file

@ -33,8 +33,8 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
false, false, false, false, /* should be banned? -> */ false), false, false, false, false, /* should be banned? -> */ false),
array('Matching values in the database, should be banned', array('Matching values in the database, should be banned',
4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true), 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true),
array('IP Banned, should be banned', array('IP Banned, should not be banned',
false, '127.1.1.1', false, false, /* should be banned? -> */ true), false, '127.1.1.1', false, false, /* should be banned? -> */ false),
); );
} }

34
tests/session/fixtures/sessions_banlist.xml
View file

@ -26,34 +26,46 @@
<value>1</value> <value>1</value>
</row> </row>
</table> </table>
<table name="phpbb_banlist"> <table name="phpbb_bans">
<column>ban_id</column> <column>ban_id</column>
<column>ban_userid</column> <column>ban_mode</column>
<column>ban_ip</column> <column>ban_item</column>
<column>ban_email</column>
<column>ban_start</column> <column>ban_start</column>
<column>ban_end</column> <column>ban_end</column>
<column>ban_exclude</column>
<column>ban_reason</column> <column>ban_reason</column>
<column>ban_give_reason</column> <column>ban_reason_display</column>
<row> <row>
<value>2</value> <value>2</value>
<value>4</value> <value>ip</value>
<value>127.0.0.1</value> <value>127.0.0.1</value>
<value>bar@example.org</value>
<value>1111</value> <value>1111</value>
<value>0</value> <value>0</value>
<value>0</value>
<value>HAHAHA</value> <value>HAHAHA</value>
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value> <value>3</value>
<value>0</value> <value>ip</value>
<value>127.1.1.1</value> <value>127.1.1.1</value>
<value></value>
<value>1111</value> <value>1111</value>
<value>0</value> <value>0</value>
<value>HAHAHA</value>
<value>1</value>
</row>
<row>
<value>4</value>
<value>user</value>
<value>4</value>
<value>1111</value>
<value>0</value>
<value>HAHAHA</value>
<value>1</value>
</row>
<row>
<value>5</value>
<value>email</value>
<value>bar@example.org</value>
<value>1111</value>
<value>0</value> <value>0</value>
<value>HAHAHA</value> <value>HAHAHA</value>
<value>1</value> <value>1</value>

10
tests/session/fixtures/sessions_empty.xml
View file

@ -30,11 +30,13 @@
<column>session_ip</column> <column>session_ip</column>
<column>session_browser</column> <column>session_browser</column>
</table> </table>
<table name="phpbb_banlist"> <table name="phpbb_bans">
<column>ban_id</column> <column>ban_id</column>
<column>ban_userid</column> <column>ban_mode</column>
<column>ban_email</column> <column>ban_item</column>
<column>ban_start</column>
<column>ban_end</column>
<column>ban_reason</column> <column>ban_reason</column>
<column>ban_give_reason</column> <column>ban_reason_display</column>
</table> </table>
</dataset> </dataset>