Change data encapsulation

Author: rixafy

src/MinecraftQueryResolver.php

@@ -51,20 +51,7 @@ public static function fromAddress(string $host, $timeout = 2, $resolveSRV = tru
 	 */
 	public function getResult(): MinecraftQueryResult
 	{
-		if ($this->rawData === null) {
-			$this->retrieveData();
-		}
-
-		return new MinecraftQueryResult(
-			isset($this->rawData['version']['name']) ? $this->rawData['version']['name'] : 'Unknown version',
-			isset($this->rawData['version']['protocol']) ? (int) $this->rawData['version']['protocol'] : 0,
-			isset($this->rawData['players']['online']) ? (int) $this->rawData['players']['online'] : 0,
-			isset($this->rawData['players']['max']) ? (int) $this->rawData['players']['max'] : 0,
-			isset($this->rawData['players']['sample']) ? (array) $this->rawData['players']['sample'] : [],
-			isset($this->rawData['description']['text']) ? (string) $this->rawData['description']['text'] : '',
-			$this->rawData['latency'],
-			isset($this->rawData['favicon']) ? (string) $this->rawData['favicon'] : null,
-		);
+		return MinecraftQueryResult::fromRawData($this->getRawData());
 	}
 
 	/**

src/MinecraftQueryResult.php

@@ -89,4 +89,18 @@ public function getLatency(): int
 	{
 		return $this->latency;
 	}
+	
+	public static function fromRawData(array $rawData): self
+	{
+		return new MinecraftQueryResult(
+			isset($rawData['version']['name']) ? $rawData['version']['name'] : 'Unknown version',
+			isset($rawData['version']['protocol']) ? (int) $rawData['version']['protocol'] : 0,
+			isset($rawData['players']['online']) ? (int) $rawData['players']['online'] : 0,
+			isset($rawData['players']['max']) ? (int) $rawData['players']['max'] : 0,
+			isset($rawData['players']['sample']) ? (array) $rawData['players']['sample'] : [],
+			isset($rawData['description']['text']) ? (string) $rawData['description']['text'] : '',
+			$rawData['latency'],
+			isset($rawData['favicon']) ? (string) $rawData['favicon'] : null
+		);
+	}
 }