Added class names

Php 7.4 or later is now required

Author: Simonsator

PAFLib/PAFPlayer.php

@@ -9,61 +9,64 @@
 require_once('PAFPlayerManager.php');
 
 class PAFPlayer {
-	private $uniqueID;
-	private $name;
-	private $id;
+	private string $uniqueID;
+	private string $name;
+	private int $id;
 
-	function __construct($pUUID, $pName, $pID) {
+	function __construct(string $pUUID, string $pName, int $pID) {
 		$this->uniqueID = $pUUID;
 		$this->name = $pName;
 		$this->id = $pID;
 	}
 
-	public function getName() {
+	public function getName(): string {
 		return $this->name;
 	}
 
-	public function getUniqueID() {
+	public function getUniqueID(): string {
 		return $this->uniqueID;
 	}
 
-	public function getID() {
+	public function getID(): int {
 		return $this->id;
 	}
 
-	public function getFriends() {
+	public function getFriends(): array {
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare("SELECT player_id, player_uuid, player_name FROM " . PAFPlayerManager::getInstance()->getTablePrefix() . "players WHERE player_id IN(SELECT friend1_id FROM " . PAFPlayerManager::getInstance()->getTablePrefix() . "friend_assignment WHERE friend2_id='" . $this->id . "') OR player_id IN(SELECT friend2_id FROM fr_friend_assignment WHERE friend1_id='" . $this->id . "')");
 		$stmt->execute();
 		$i = 0;
 		foreach ($stmt as $row) {
 			$friends[$i] = new PAFPlayer($row['player_uuid'], $row['player_name'], $row['player_id']);
 			$i++;
 		}
-		if(isset($friends))
+		if (isset($friends))
 			return $friends;
+		return [];
 	}
-	
-	public function getFriendRequests() {
+
+	public function getFriendRequests(): array {
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare("SELECT player_id, player_uuid, player_name FROM " . PAFPlayerManager::getInstance()->getTablePrefix() . "players WHERE player_id IN(SELECT requester_id FROM " . PAFPlayerManager::getInstance()->getTablePrefix() . "friend_request_assignment WHERE receiver_id='" . $this->id . "')");
 		$stmt->execute();
 		$i = 0;
 		foreach ($stmt as $row) {
 			$friends[$i] = new PAFPlayer($row['player_uuid'], $row['player_name'], $row['player_id']);
 			$i++;
 		}
-		if(isset($friends))
+		if (isset($friends))
 			return $friends;
+		return [];
 	}
-	
-	public function getSentFriendRequests() {
+
+	public function getSentFriendRequests(): array {
 		$stmt = PAFPlayerManager::getInstance()->getConnection()->prepare("SELECT player_id, player_uuid, player_name FROM " . PAFPlayerManager::getInstance()->getTablePrefix() . "players WHERE player_id IN(SELECT receiver_id FROM " . PAFPlayerManager::getInstance()->getTablePrefix() . "friend_request_assignment WHERE requester_id='" . $this->id . "')");
 		$stmt->execute();
 		$i = 0;
 		foreach ($stmt as $row) {
 			$friends[$i] = new PAFPlayer($row['player_uuid'], $row['player_name'], $row['player_id']);
 			$i++;
 		}
-		if(isset($friends))
+		if (isset($friends))
 			return $friends;
+		return [];
 	}
 }

PAFLib/PAFPlayerManager.php

@@ -6,25 +6,28 @@
  */
 
 namespace PartyAndFriends\Lib\PAFPlayer;
+
+use PDO;
+
 require_once('PAFPlayer.php');
 
 /**
  * Class PAFPlayerManager This class is to get
  * @package PartyAndFriends\Lib\PAFPlayer
  */
 class PAFPlayerManager {
-	private static $instance;
-	private $connection;
-	private $tablePrefix;
+	private static PAFPlayerManager $instance;
+	private PDO $connection;
+	private string $tablePrefix;
 
-	function __construct($pPod, $tablePrefix) {
+	function __construct(PDO $pPod, string $tablePrefix) {
 		self::$instance = $this;
 		$this->connection = $pPod;
 		$this->tablePrefix = $tablePrefix;
 	}
 
-	public function getPlayerByUUID($pUUID) {
-		$stmt = $this->connection->prepare("SELECT player_id, player_uuid, player_name FROM fr_players WHERE player_uuid=:uuid LIMIT 1");
+	public function getPlayerByUUID(string $pUUID): ?PAFPlayer {
+		$stmt = $this->connection->prepare("SELECT player_id, player_uuid, player_name FROM " . $this->getTablePrefix() . "players WHERE player_uuid=:uuid LIMIT 1");
 		$stmt->bindParam(':uuid', $pUUID);
 		$stmt->execute();
 		if ($stmt->rowCount() == 0) {
@@ -34,8 +37,8 @@ public function getPlayerByUUID($pUUID) {
 		return new PAFPlayer($row['player_uuid'], $row['player_name'], $row['player_id']);
 	}
 
-	public function getPlayerByID($pID) {
-		$stmt = $this->connection->prepare("SELECT player_id, player_uuid, player_name FROM fr_players WHERE player_id=:id LIMIT 1");
+	public function getPlayerByID($pID): ?PAFPlayer {
+		$stmt = $this->connection->prepare("SELECT player_id, player_uuid, player_name FROM " . $this->getTablePrefix() . "players WHERE player_id=:id LIMIT 1");
 		$stmt->bindParam(':id', $pID);
 		$stmt->execute();
 		if ($stmt->rowCount() == 0) {
@@ -45,12 +48,12 @@ public function getPlayerByID($pID) {
 		return new PAFPlayer($row['player_uuid'], $row['player_name'], $row['player_id']);
 	}
 
-	public function getConnection() {
+	public function getConnection(): PDO {
 		return $this->connection;
 	}
 
-	public function getPlayerByName($pPlayerName) {
-		$stmt = $this->connection->prepare("SELECT player_id, player_uuid, player_name FROM " . PAFPlayerManager::getInstance()->getTablePrefix() . "players WHERE player_name=:name LIMIT 1");
+	public function getPlayerByName($pPlayerName): ?PAFPlayer {
+		$stmt = $this->connection->prepare("SELECT player_id, player_uuid, player_name FROM " . $this->getTablePrefix() . "players WHERE player_name=:name LIMIT 1");
 		$stmt->bindParam(':name', $pPlayerName);
 		$stmt->execute();
 		if ($stmt->rowCount() == 0) {
@@ -63,11 +66,11 @@ public function getPlayerByName($pPlayerName) {
 	/**
 	 * @return String
 	 */
-	public function getTablePrefix() {
+	public function getTablePrefix(): string {
 		return $this->tablePrefix;
 	}
 
-	public static function getInstance() {
+	public static function getInstance(): PAFPlayerManager {
 		return self::$instance;
 	}
 }