Fixed referencing table prefix

Author: Simonsator

.phpstorm.meta.php

@@ -5,7 +5,6 @@
 	// injections will have the following replacement rules.
 		sql_injection_subst(),
 		map([
-			'{PAFPlayerManager::getInstance()->getTablePrefix()}' => "fr_",
 			'{$this->getTablePrefix()}' => 'fr_',
 		]));
 }

src/Simonsator/PartyAndFriends/PAFPlayer.php

@@ -45,14 +45,14 @@ public function getFriends(): array
 	{
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare(
 			"SELECT player_id, player_uuid, player_name 
-                   FROM {PAFPlayerManager::getInstance()->getTablePrefix()}players 
+                   FROM {$this->getTablePrefix()}players 
                    WHERE player_id IN(
                        SELECT friend1_id 
-                       FROM {PAFPlayerManager::getInstance()->getTablePrefix()}friend_assignment 
+                       FROM {$this->getTablePrefix()}friend_assignment 
                        WHERE friend2_id='{$this->id}'
                    ) OR player_id IN(
                        SELECT friend2_id 
-                       FROM {PAFPlayerManager::getInstance()->getTablePrefix()}friend_assignment 
+                       FROM {$this->getTablePrefix()}friend_assignment 
                        WHERE friend1_id='{$this->id}'
                    )");
 		$stmt->execute();
@@ -73,10 +73,10 @@ public function getFriendRequests(): array
 	{
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare(
 			"SELECT player_id, player_uuid, player_name 
-                   FROM {PAFPlayerManager::getInstance()->getTablePrefix()}players 
+                   FROM {$this->getTablePrefix()}players 
                    WHERE player_id IN(
                        SELECT requester_id 
-                       FROM {PAFPlayerManager::getInstance()->getTablePrefix()}friend_request_assignment 
+                       FROM {$this->getTablePrefix()}friend_request_assignment 
                        WHERE receiver_id='{$this->id}'
                    )");
 		$stmt->execute();
@@ -97,10 +97,10 @@ public function getSentFriendRequests(): array
 	{
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare(
 			"SELECT player_id, player_uuid, player_name 
-                   FROM {PAFPlayerManager::getInstance()->getTablePrefix()}players 
+                   FROM {$this->getTablePrefix()}players 
                    WHERE player_id IN(
                        SELECT receiver_id 
-                       FROM {PAFPlayerManager::getInstance()->getTablePrefix()}friend_request_assignment 
+                       FROM {$this->getTablePrefix()}friend_request_assignment 
                        WHERE requester_id='{$this->id}'
                    )");
 		$stmt->execute();
@@ -129,7 +129,7 @@ public function getSettingsWorth(int $pSettingsID): int
 	{
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare(
 			"SELECT settings_worth 
-                   FROM {PAFPlayerManager::getInstance()->getTablePrefix()}settings 
+                   FROM {${$this->getTablePrefix()}}settings 
                    WHERE player_id = '{$this->id}' AND settings_id = '" . $pSettingsID . "' LIMIT 1");
 		$stmt->execute();
 		if (isset($stmt[0]))
@@ -144,7 +144,7 @@ public function getSettingsWorth(int $pSettingsID): int
 	public function addFriend(PAFPlayer $player)
 	{
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare(
-			"INSERT INTO {PAFPlayerManager::getInstance()->getTablePrefix()}friend_assignment 
+			"INSERT INTO {$this->getTablePrefix()}friend_assignment 
                    VALUES ('{$this->id}', '{$player->getID()}')");
 		$stmt->execute();
 	}
@@ -164,9 +164,13 @@ public function getID(): int
 	public function sendFriendRequest(PAFPlayer $player): void
 	{
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare(
-			"INSERT INTO {PAFPlayerManager::getInstance()->getTablePrefix()}friend_assignment 
+			"INSERT INTO {$this->getTablePrefix()}friend_assignment 
                    VALUES ('{$this->id}', '{$player->getID()}')");
 		$stmt->execute();
 	}
 
+	private function getTablePrefix(): string
+	{
+		return PAFPlayerManager::getInstance()->getTablePrefix();
+	}
 }