From 344c84cfa6499e5ef3cd3b7454a344829b9d3ae6 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sun, 7 Sep 2014 19:42:36 +0200
Subject: [PATCH] Added --disable-readline CLI argument

---
 src/pocketmine/command/CommandReader.php | 3 ++-
 tests/TravisTest.php                     | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pocketmine/command/CommandReader.php b/src/pocketmine/command/CommandReader.php
index ac8615f05..d908ecf77 100644
--- a/src/pocketmine/command/CommandReader.php
+++ b/src/pocketmine/command/CommandReader.php
@@ -71,7 +71,8 @@ class CommandReader extends Thread{
 
 	public function run(){
 		$this->buffer = new \Threaded;
-		if(extension_loaded("readline") and $this->stream === "php://stdin"){
+		$opts = getopt("", ["disable-readline"]);
+		if(extension_loaded("readline") and $this->stream === "php://stdin" and !isset($opts["disable-readline"])){
 			$this->readline = true;
 		}else{
 			$this->readline = false;
diff --git a/tests/TravisTest.php b/tests/TravisTest.php
index d3aac3c1d..c63c99a3e 100644
--- a/tests/TravisTest.php
+++ b/tests/TravisTest.php
@@ -19,15 +19,16 @@
  *
 */
 
-$server = proc_open("php src/pocketmine/PocketMine.php --no-wizard", [
+$server = proc_open("php src/pocketmine/PocketMine.php --no-wizard --disable-readline", [
 	0 => ["pipe", "w"],
 	1 => ["file", "php://stdout", "w"],
-	2 => ["file", "php://stderr", "w"]
+	2 => ["pipe", "r"]
 ], $pipes);
 
 fwrite($pipes[0], "version\nmakeserver\nstop\n\n");
 
 fclose($pipes[0]);
+fclose($pipes[2]);
 
 echo "\n\nReturn value: ". proc_close($server) ."\n";