mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4010 from Elsensee/ticket/14264

Browse Source 
[ticket/14264] Don't use constants as return values
This commit is contained in:
Máté Bartus
2015-11-05 21:43:00 +01:00
parent c783c37c73 ed02365868
commit 402f36e42d
17 changed files with 31 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/text_reparser/plugins/forum_description_test.php
View File

@@ -21,6 +21,6 @@ class phpbb_textreparser_forum_description_test extends phpbb_textreparser_test_
protected function get_reparser()
{
return new \phpbb\textreparser\plugins\forum_description($this->db);
return new \phpbb\textreparser\plugins\forum_description($this->db, FORUMS_TABLE);
}
}

2
tests/text_reparser/plugins/forum_rules_test.php
View File

@@ -21,6 +21,6 @@ class phpbb_textreparser_forum_rules_test extends phpbb_textreparser_test_row_ba
protected function get_reparser()
{
return new \phpbb\textreparser\plugins\forum_rules($this->db);
return new \phpbb\textreparser\plugins\forum_rules($this->db, FORUMS_TABLE);
}
}

2
tests/text_reparser/plugins/group_description_test.php
View File

@@ -21,6 +21,6 @@ class phpbb_textreparser_group_description_test extends phpbb_textreparser_test_
protected function get_reparser()
{
return new \phpbb\textreparser\plugins\group_description($this->db);
return new \phpbb\textreparser\plugins\group_description($this->db, GROUPS_TABLE);
}
}

2
tests/text_reparser/plugins/pm_text_test.php
View File

@@ -21,6 +21,6 @@ class phpbb_textreparser_pm_text_test extends phpbb_textreparser_test_row_based_
protected function get_reparser()
{
return new \phpbb\textreparser\plugins\pm_text($this->db);
return new \phpbb\textreparser\plugins\pm_text($this->db, PRIVMSGS_TABLE);
}
}

2
tests/text_reparser/plugins/poll_title_test.php
View File

@@ -21,6 +21,6 @@ class phpbb_textreparser_poll_title_test extends phpbb_textreparser_test_row_bas
protected function get_reparser()
{
return new \phpbb\textreparser\plugins\poll_title($this->db);
return new \phpbb\textreparser\plugins\poll_title($this->db, TOPICS_TABLE);
}
}

2
tests/text_reparser/plugins/post_text_test.php
View File

@@ -21,6 +21,6 @@ class phpbb_textreparser_post_text_test extends phpbb_textreparser_test_row_base
protected function get_reparser()
{
return new \phpbb\textreparser\plugins\post_text($this->db);
return new \phpbb\textreparser\plugins\post_text($this->db, POSTS_TABLE);
}
}

7
tests/text_reparser/plugins/test_row_based_plugin.php
View File

@@ -24,8 +24,13 @@ abstract class phpbb_textreparser_test_row_based_plugin extends phpbb_database_t
{
$reparser = $this->get_reparser();
$columns = $reparser->get_columns();
$reflection_reparser = new ReflectionClass(get_class($reparser));
$table_property = $reflection_reparser->getProperty('table');
$table_property->setAccessible(true);
$sql = 'SELECT ' . $columns['id'] . ' AS id, ' . $columns['text'] . ' AS text
FROM ' . $reparser->get_table_name() . '
FROM ' . $table_property->getValue($reparser) . '
WHERE ' . $this->db->sql_in_set($columns['id'], $ids) . '
ORDER BY id';
$result = $this->db->sql_query($sql);

2
tests/text_reparser/plugins/user_signature_test.php
View File

@@ -21,6 +21,6 @@ class phpbb_textreparser_user_signature_test extends phpbb_textreparser_test_row
protected function get_reparser()
{
return new \phpbb\textreparser\plugins\user_signature($this->db);
return new \phpbb\textreparser\plugins\user_signature($this->db, USERS_TABLE);
}
}