Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #250 from marc1706/ticket/249

Browse Source 
[ticket/249] Fix codesniffer issues
This commit is contained in:
Marc Alexander
2014-06-09 00:42:53 +02:00
parent 89f3355c76 eb256a647d
commit e07af8de27
26 changed files with 61 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
includes/trim_message/bbcodes.php
View File

@@ -175,7 +175,6 @@ class phpbb_trim_message_bbcodes
$this->is_sensitive = true;
}
$this->open_bbcode($bbcode_tag, $this->cur_position);
$this->cur_position += utf8_strlen($exploded_parts[0]) + $bbcode_end_length;
$this->bbcode_action($bbcode_tag, 'open_end', $this->cur_position);

1
modules/announcements.php
View File

@@ -310,7 +310,6 @@ class announcements extends module_base
$this->pagination->generate_template_pagination($view_topic_url, 'announcements_center_row.pagination', 'start', $fetch_news[$i]['topic_replies'] + 1, $this->config['posts_per_page'], 1, true, true);
if(!empty($fetch_news[$i]['attachments']))
{
foreach ($fetch_news[$i]['attachments'] as $attachment)

1
modules/news.php
View File

@@ -114,7 +114,6 @@ class news extends module_base
$portal_news_length = ($news < 0) ? $this->config['board3_news_length_' . $module_id] : 0;
$fetch_news = phpbb_fetch_posts($module_id, $this->config['board3_news_forum_' . $module_id], $this->config['board3_news_permissions_' . $module_id], $this->config['board3_number_of_news_' . $module_id], $portal_news_length, 0, ($this->config['board3_show_all_news_' . $module_id]) ? 'news_all' : 'news', $start, $this->config['board3_news_exclude_' . $module_id]);
// Any news present? If not terminate it here.
if (sizeof($fetch_news) == 0)
{

1
modules/stylechanger.php
View File

@@ -116,7 +116,6 @@ class stylechanger extends module_base
$this->template->assign_var('STYLE_SELECT', $style_select);
}
// Assign specific vars
$this->template->assign_vars(array(
'S_STYLE_OPTIONS' => ($this->config['override_user_style'] || $style_count < 2) ? '' : style_select($this->user->data['user_style']),

1
modules/user_menu.php
View File

@@ -145,7 +145,6 @@ class user_menu extends module_base
$unread_list = get_unread_topics($this->user->data['user_id'], $sql_where, 'ORDER BY t.topic_id DESC');
$unread_posts_count = sizeof($unread_list);
// Get user avatar and rank
$user_id = $this->user->data['user_id'];
$username = $this->user->data['username'];

25
phpunit.xml.all
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
verbose="true"
bootstrap="tests/bootstrap.php">
<testsuites>
<testsuite name="phpBB Gallery Test Suite">
<directory suffix="_test.php">./tests/</directory>
</testsuite>
</testsuites>
<filter>
<blacklist>
<directory>./tests/</directory>
</blacklist>
</filter>
</phpunit>

5
phpunit.xml.dist
View File

@@ -12,14 +12,13 @@
verbose="true"
bootstrap="tests/bootstrap.php">
<testsuites>
<testsuite name="phpBB Gallery Test Suite">
<directory suffix="_test.php">./tests/</directory>
<testsuite name="Board3 Portal Test Suite">
<directory suffix="_test.php">./tests</directory>
</testsuite>
</testsuites>
<groups>
<exclude>
<group>functional</group>
<group>slow</group>
</exclude>
</groups>

31
phpunit.xml.functional
View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
verbose="true"
bootstrap="tests/bootstrap.php">
<testsuites>
<testsuite name="phpBB Gallery Test Suite">
<directory suffix="_test.php">./tests/</directory>
</testsuite>
</testsuites>
<groups>
<include>
<group>functional</group>
</include>
</groups>
<filter>
<blacklist>
<directory>./tests/</directory>
</blacklist>
</filter>
</phpunit>

6
travis/phpunit-mariadb-travis.xml
View File

@@ -13,9 +13,9 @@
bootstrap="../tests/bootstrap.php">
<testsuites>
<testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory>
<exclude>tests/functional</exclude>
<exclude>tests/lint_test.php</exclude>
<directory suffix="_test.php">../tests</directory>
<exclude>../tests/functional</exclude>
<exclude>../tests/lint_test.php</exclude>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>

4
travis/phpunit-mysql-travis.xml
View File

@@ -13,8 +13,8 @@
bootstrap="../tests/bootstrap.php">
<testsuites>
<testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory>
<exclude>tests/functional</exclude>
<directory suffix="_test.php">../tests</directory>
<exclude>../tests/functional</exclude>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>

4
travis/phpunit-postgres-travis.xml
View File

@@ -13,8 +13,8 @@
bootstrap="../tests/bootstrap.php">
<testsuites>
<testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory>
<exclude>tests/functional</exclude>
<directory suffix="_test.php">../tests</directory>
<exclude>../tests/functional</exclude>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>