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

[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset

Browse source 
PHPBB3-12722
This commit is contained in:
Tristan Darricau 2014-06-15 19:46:12 +02:00
parent 663c375f5c
commit ca3cdadd08
11 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/code_sniffer/ruleset-php-legacy.xml
View file

@ -20,6 +20,9 @@
<!-- Call-time pass-by-reference MUST not be used. --> <!-- Call-time pass-by-reference MUST not be used. -->
<rule ref="Generic.Functions.CallTimePassByReference.NotAllowed" /> <rule ref="Generic.Functions.CallTimePassByReference.NotAllowed" />
<!-- There MUST be exactly one space after a cast. -->
<rule ref="Generic.Formatting.SpaceAfterCast" />
<!-- Class constants MUST be declared in all upper case with underscore separators. --> <!-- Class constants MUST be declared in all upper case with underscore separators. -->
<rule ref="Generic.NamingConventions.UpperCaseConstantName" /> <rule ref="Generic.NamingConventions.UpperCaseConstantName" />

2
phpBB/includes/acp/auth.php
View file

@ -835,7 +835,7 @@ class auth_admin extends \phpbb\auth\auth
} }
// Remove current auth options... // Remove current auth options...
$auth_option_ids = array((int)$any_option_id); $auth_option_ids = array((int) $any_option_id);
foreach ($auth as $auth_option => $auth_setting) foreach ($auth as $auth_option => $auth_setting)
{ {
$auth_option_ids[] = (int) $this->acl_options['id'][$auth_option]; $auth_option_ids[] = (int) $this->acl_options['id'][$auth_option];

4
phpBB/includes/functions_convert.php
View file

@ -1007,8 +1007,8 @@ function get_remote_avatar_dim($src, $axis)
{ {
$bigger = ($remote_avatar_cache[$src][0] > $remote_avatar_cache[$src][1]) ? 0 : 1; $bigger = ($remote_avatar_cache[$src][0] > $remote_avatar_cache[$src][1]) ? 0 : 1;
$ratio = $default[$bigger] / $remote_avatar_cache[$src][$bigger]; $ratio = $default[$bigger] / $remote_avatar_cache[$src][$bigger];
$remote_avatar_cache[$src][0] = (int)($remote_avatar_cache[$src][0] * $ratio); $remote_avatar_cache[$src][0] = (int) ($remote_avatar_cache[$src][0] * $ratio);
$remote_avatar_cache[$src][1] = (int)($remote_avatar_cache[$src][1] * $ratio); $remote_avatar_cache[$src][1] = (int) ($remote_avatar_cache[$src][1] * $ratio);
} }
} }

14
phpBB/includes/functions_user.php
View file

@ -755,7 +755,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
else else
{ {
$ban_other = explode('-', $ban_len_other); $ban_other = explode('-', $ban_len_other);
if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) && if (sizeof($ban_other) == 3 && ((int) $ban_other[0] < 9999) &&
(strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2)) (strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2))
{ {
$ban_end = max($current_time, $user->create_datetime() $ban_end = max($current_time, $user->create_datetime()
@ -2086,7 +2086,7 @@ function avatar_delete($mode, $row, $clean_db = false)
// Check if the users avatar is actually *not* a group avatar // Check if the users avatar is actually *not* a group avatar
if ($mode == 'user') if ($mode == 'user')
{ {
if (strpos($row['user_avatar'], 'g') === 0 || (((int)$row['user_avatar'] !== 0) && ((int)$row['user_avatar'] !== (int)$row['user_id']))) if (strpos($row['user_avatar'], 'g') === 0 || (((int) $row['user_avatar'] !== 0) && ((int) $row['user_avatar'] !== (int) $row['user_id'])))
{ {
return false; return false;
} }
@ -2419,7 +2419,7 @@ function group_correct_avatar($group_id, $old_entry)
{ {
global $config, $db, $phpbb_root_path; global $config, $db, $phpbb_root_path;
$group_id = (int)$group_id; $group_id = (int) $group_id;
$ext = substr(strrchr($old_entry, '.'), 1); $ext = substr(strrchr($old_entry, '.'), 1);
$old_filename = get_avatar_filename($old_entry); $old_filename = get_avatar_filename($old_entry);
$new_filename = $config['avatar_salt'] . "_g$group_id.$ext"; $new_filename = $config['avatar_salt'] . "_g$group_id.$ext";
@ -2844,7 +2844,7 @@ function remove_default_avatar($group_id, $user_ids)
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . GROUPS_TABLE . ' FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . (int)$group_id; WHERE group_id = ' . (int) $group_id;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!$row = $db->sql_fetchrow($result)) if (!$row = $db->sql_fetchrow($result))
{ {
@ -2885,7 +2885,7 @@ function remove_default_rank($group_id, $user_ids)
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . GROUPS_TABLE . ' FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . (int)$group_id; WHERE group_id = ' . (int) $group_id;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!$row = $db->sql_fetchrow($result)) if (!$row = $db->sql_fetchrow($result))
{ {
@ -2896,9 +2896,9 @@ function remove_default_rank($group_id, $user_ids)
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_rank = 0 SET user_rank = 0
WHERE group_id = ' . (int)$group_id . ' WHERE group_id = ' . (int) $group_id . '
AND user_rank <> 0 AND user_rank <> 0
AND user_rank = ' . (int)$row['group_rank'] . ' AND user_rank = ' . (int) $row['group_rank'] . '
AND ' . $db->sql_in_set('user_id', $user_ids); AND ' . $db->sql_in_set('user_id', $user_ids);
$db->sql_query($sql); $db->sql_query($sql);
} }

2
phpBB/includes/utf/utf_tools.php
View file

@ -534,7 +534,7 @@ else
return ''; return '';
} }
$lx = (int)((-$length) / 65535); $lx = (int) ((-$length) / 65535);
$ly = (-$length) % 65535; $ly = (-$length) % 65535;
// negative length requires ... capture everything // negative length requires ... capture everything

2
phpBB/install/convertors/functions_phpbb20.php
View file

@ -223,7 +223,7 @@ function phpbb_insert_forums()
'forum_desc' => htmlspecialchars(phpbb_set_default_encoding($row['forum_desc']), ENT_COMPAT, 'UTF-8'), 'forum_desc' => htmlspecialchars(phpbb_set_default_encoding($row['forum_desc']), ENT_COMPAT, 'UTF-8'),
'forum_type' => FORUM_POST, 'forum_type' => FORUM_POST,
'forum_status' => is_item_locked($row['forum_status']), 'forum_status' => is_item_locked($row['forum_status']),
'enable_prune' => ($prune_enabled) ? (int)$row['prune_enable'] : 0, 'enable_prune' => ($prune_enabled) ? (int) $row['prune_enable'] : 0,
'prune_next' => (int) null_to_zero($row['prune_next']), 'prune_next' => (int) null_to_zero($row['prune_next']),
'prune_days' => (int) null_to_zero($row['prune_days']), 'prune_days' => (int) null_to_zero($row['prune_days']),
'prune_viewed' => 0, 'prune_viewed' => 0,

4
phpBB/phpbb/feed/post_base.php
View file

@ -48,8 +48,8 @@ abstract class post_base extends \phpbb\feed\attachments_base
{ {
$item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row) $item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
. ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')]) . ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')])
. (($this->is_moderator_approve_forum($row['forum_id']) && (int)$row['post_visibility'] === ITEM_UNAPPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '') . (($this->is_moderator_approve_forum($row['forum_id']) && (int) $row['post_visibility'] === ITEM_UNAPPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '')
. (($this->is_moderator_approve_forum($row['forum_id']) && (int)$row['post_visibility'] === ITEM_DELETED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_DELETED'] : ''); . (($this->is_moderator_approve_forum($row['forum_id']) && (int) $row['post_visibility'] === ITEM_DELETED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_DELETED'] : '');
} }
} }
} }

4
phpBB/phpbb/feed/topic_base.php
View file

@ -52,11 +52,11 @@ abstract class topic_base extends \phpbb\feed\attachments_base
if ($this->is_moderator_approve_forum($row['forum_id'])) if ($this->is_moderator_approve_forum($row['forum_id']))
{ {
if ( (int)$row['topic_visibility'] === ITEM_DELETED) if ((int) $row['topic_visibility'] === ITEM_DELETED)
{ {
$item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_DELETED']; $item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_DELETED'];
} }
else if ((int)$row['topic_visibility'] === ITEM_UNAPPROVED) else if ((int) $row['topic_visibility'] === ITEM_UNAPPROVED)
{ {
$item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_UNAPPROVED']; $item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_UNAPPROVED'];
} }

4
phpBB/phpbb/search/fulltext_sphinx.php
View file

@ -693,7 +693,7 @@ class fulltext_sphinx
{ {
if ($mode == 'edit') if ($mode == 'edit')
{ {
$this->sphinx->UpdateAttributes($this->indexes, array('forum_id', 'poster_id'), array((int)$post_id => array((int)$forum_id, (int)$poster_id))); $this->sphinx->UpdateAttributes($this->indexes, array('forum_id', 'poster_id'), array((int) $post_id => array((int) $forum_id, (int) $poster_id)));
} }
else if ($mode != 'post' && $post_id) else if ($mode != 'post' && $post_id)
{ {
@ -718,7 +718,7 @@ class fulltext_sphinx
$post_time = time(); $post_time = time();
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
$post_updates[(int)$row['post_id']] = array($post_time); $post_updates[(int) $row['post_id']] = array($post_time);
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);