From 51ed564c5ea1b5909a53cfd64dc217f292080630 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sun, 25 Aug 2019 16:46:01 +0100
Subject: [PATCH] SetupWizard: remove non-obvious dependencies on dynamic
 constants, require path in constructor

---
 src/PocketMine.php         |  2 +-
 src/wizard/SetupWizard.php | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/PocketMine.php b/src/PocketMine.php
index b8d5a7773..65d199927 100644
--- a/src/PocketMine.php
+++ b/src/PocketMine.php
@@ -262,7 +262,7 @@ namespace pocketmine {
 		$exitCode = 0;
 		do{
 			if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
-				$installer = new SetupWizard();
+				$installer = new SetupWizard(\pocketmine\DATA);
 				if(!$installer->run()){
 					$exitCode = -1;
 					break;
diff --git a/src/wizard/SetupWizard.php b/src/wizard/SetupWizard.php
index 3ecc9de05..a0c6f67be 100644
--- a/src/wizard/SetupWizard.php
+++ b/src/wizard/SetupWizard.php
@@ -47,9 +47,11 @@ class SetupWizard{
 
 	/** @var Language */
 	private $lang;
+	/** @var string */
+	private $dataPath;
 
-	public function __construct(){
-
+	public function __construct(string $dataPath){
+		$this->dataPath = $dataPath;
 	}
 
 	public function run() : bool{
@@ -84,7 +86,7 @@ class SetupWizard{
 		}
 
 		//this has to happen here to prevent user avoiding agreeing to license
-		$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES);
+		$config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
 		$config->set("language", $lang);
 		$config->save();
 
@@ -132,7 +134,7 @@ LICENSE;
 	}
 
 	private function generateBaseConfig() : void{
-		$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES);
+		$config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
 
 		$config->set("motd", ($name = $this->getInput($this->lang->get("name_your_server"), self::DEFAULT_NAME)));
 		$config->set("server-name", $name);
@@ -169,14 +171,14 @@ LICENSE;
 		if($op === ""){
 			$this->error($this->lang->get("op_warning"));
 		}else{
-			$ops = new Config(\pocketmine\DATA . "ops.txt", Config::ENUM);
+			$ops = new Config($this->dataPath . "/ops.txt", Config::ENUM);
 			$ops->set($op, true);
 			$ops->save();
 		}
 
 		$this->message($this->lang->get("whitelist_info"));
 
-		$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES);
+		$config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
 		if(strtolower($this->getInput($this->lang->get("whitelist_enable"), "n", "y/N")) === "y"){
 			$this->error($this->lang->get("whitelist_warning"));
 			$config->set("white-list", true);
@@ -187,7 +189,7 @@ LICENSE;
 	}
 
 	private function networkFunctions() : void{
-		$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES);
+		$config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
 		$this->error($this->lang->get("query_warning1"));
 		$this->error($this->lang->get("query_warning2"));
 		if(strtolower($this->getInput($this->lang->get("query_disable"), "n", "y/N")) === "y"){