Merge pull request #4010 from Elsensee/ticket/14264

[ticket/14264] Don't use constants as return values

8 files changed, 13 insertions, 8 deletions

diff --git a/tests/text_reparser/plugins/forum_description_test.php b/tests/text_reparser/plugins/forum_description_test.php
index 3b739353cd..57166e6a3c 100644
--- a/tests/text_reparser/plugins/forum_description_test.php
+++ b/tests/text_reparser/plugins/forum_description_test.php
@@ -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);
 	}
 }
diff --git a/tests/text_reparser/plugins/forum_rules_test.php b/tests/text_reparser/plugins/forum_rules_test.php
index 4c267c9014..72e4e98876 100644
--- a/tests/text_reparser/plugins/forum_rules_test.php
+++ b/tests/text_reparser/plugins/forum_rules_test.php
@@ -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);
 	}
 }
diff --git a/tests/text_reparser/plugins/group_description_test.php b/tests/text_reparser/plugins/group_description_test.php
index 51035903e1..babfc7e02f 100644
--- a/tests/text_reparser/plugins/group_description_test.php
+++ b/tests/text_reparser/plugins/group_description_test.php
@@ -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);
 	}
 }
diff --git a/tests/text_reparser/plugins/pm_text_test.php b/tests/text_reparser/plugins/pm_text_test.php
index 3896a57e98..6dc1a9cb4c 100644
--- a/tests/text_reparser/plugins/pm_text_test.php
+++ b/tests/text_reparser/plugins/pm_text_test.php
@@ -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);
 	}
 }
diff --git a/tests/text_reparser/plugins/poll_title_test.php b/tests/text_reparser/plugins/poll_title_test.php
index 76ca2ee228..046b6019c8 100644
--- a/tests/text_reparser/plugins/poll_title_test.php
+++ b/tests/text_reparser/plugins/poll_title_test.php
@@ -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);
 	}
 }
diff --git a/tests/text_reparser/plugins/post_text_test.php b/tests/text_reparser/plugins/post_text_test.php
index 0f934a06ee..8ea71e65f5 100644
--- a/tests/text_reparser/plugins/post_text_test.php
+++ b/tests/text_reparser/plugins/post_text_test.php
@@ -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);
 	}
 }
diff --git a/tests/text_reparser/plugins/test_row_based_plugin.php b/tests/text_reparser/plugins/test_row_based_plugin.php
index bbae44c8e0..e8218dfdd6 100644
--- a/tests/text_reparser/plugins/test_row_based_plugin.php
+++ b/tests/text_reparser/plugins/test_row_based_plugin.php
@@ -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);
diff --git a/tests/text_reparser/plugins/user_signature_test.php b/tests/text_reparser/plugins/user_signature_test.php
index ab830a303d..5b66f2788a 100644
--- a/tests/text_reparser/plugins/user_signature_test.php
+++ b/tests/text_reparser/plugins/user_signature_test.php
@@ -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);
 	}
 }