Added uopz extension (for monkey patching)

src/build/compile.sh

@@ -9,6 +9,7 @@ READLINE_VERSION="6.3"
 NCURSES_VERSION="5.9"
 PHPNCURSES_VERSION="1.0.2"
 PTHREADS_VERSION="2.0.4"
+UOPZ_VERSION="2.0.3"
 WEAKREF_VERSION="0.2.2"
 PHPYAML_VERSION="1.1.1"
 YAML_VERSION="0.1.4"
@@ -508,6 +509,13 @@ download_file "http://pecl.php.net/get/pthreads-$PTHREADS_VERSION.tgz" | tar -zx
 mv pthreads-$PTHREADS_VERSION "$DIR/install_data/php/ext/pthreads"
 echo " done!"
 
+
+#uopz
+echo -n "[PHP uopz] downloading $UOPZ_VERSION..."
+download_file "http://pecl.php.net/get/uopz-$UOPZ_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1
+mv uopz-$UOPZ_VERSION "$DIR/install_data/php/ext/uopz"
+echo " done!"
+
 #WeakRef
 #echo -n "[PHP WeakRef] downloading $WEAKREF_VERSION..."
 #download_file "http://pecl.php.net/get/Weakref-$WEAKREF_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1
@@ -629,6 +637,7 @@ $HAVE_READLINE \
 --enable-calendar \
 --enable-pthreads \
 --enable-pthreads-pedantic \
+--enable-uopz \
 --disable-libxml \
 --disable-xml \
 --disable-dom \
@@ -700,6 +709,7 @@ echo "short_open_tag=0" >> "$DIR/bin/php5/bin/php.ini"
 echo "asp_tags=0" >> "$DIR/bin/php5/bin/php.ini"
 echo "phar.readonly=0" >> "$DIR/bin/php5/bin/php.ini"
 echo "phar.require_hash=1" >> "$DIR/bin/php5/bin/php.ini"
+echo "zend_extension=uopz.so" >> "$DIR/bin/php5/bin/php.ini"
 if [ "$IS_CROSSCOMPILE" != "crosscompile" ]; then
 	echo "zend_extension=opcache.so" >> "$DIR/bin/php5/bin/php.ini"
 	echo "opcache.enable=1" >> "$DIR/bin/php5/bin/php.ini"

src/build/installer.sh

@@ -68,12 +68,23 @@ rm -f LICENSE
 rm -f start.sh
 rm -f start.bat
 echo "[1/3] Downloading PocketMine-MP $PMMP_VERSION..."
-download_file "https://github.com/PocketMine/PocketMine-MP/archive/$PMMP_VERSION.tar.gz" | tar -zx > /dev/null
-mv -f PocketMine-MP-$PMMP_VERSION/* ./
-rm -f -r PocketMine-MP-$PMMP_VERSION/
-rm -f ./start.cmd
+set -e
+download_file "https://github.com/PocketMine/PocketMine-MP/releases/download/$PMMP_VERSION/PocketMine-MP.phar" > PocketMine-MP.phar
+if ! [ -s "PocketMine-MP.phar" ]; then
+	rm "PocketMine-MP.phar" > /dev/null
+	download_file "https://github.com/PocketMine/PocketMine-MP/archive/$PMMP_VERSION.tar.gz" | tar -zx > /dev/null
+	COMPILE_SCRIPT="./src/build/compile.sh"
+	mv -f PocketMine-MP-$PMMP_VERSION/* ./
+	rm -f -r PocketMine-MP-$PMMP_VERSION/
+	rm -f ./start.cmd
+else
+	download_file "https://raw.githubusercontent.com/PocketMine/PocketMine-MP/$PMMP_VERSION/start.sh" > start.sh
+	download_file "https://raw.githubusercontent.com/PocketMine/PocketMine-MP/$PMMP_VERSION/src/build/compile.sh" > compile.sh
+	COMPILE_SCRIPT="./compile.sh"
+fi
+set +e
+chmod +x "$COMPILE_SCRIPT"
 chmod +x ./start.sh
-chmod +x ./src/build/compile.sh
 if [ "$update" == "on" ]; then
 	echo "[3/3] Skipping PHP recompilation due to user request"
 else
@@ -93,6 +104,8 @@ else
 			if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then
 				echo -n " regenerating php.ini..."
 				TIMEZONE=$(date +%Z)
+				UOPZ_PATH="$(find $(pwd) -name uopz.so)"
+				echo "zend_extension=\"$UOPZ_PATH\"" > "./bin/php5/bin/php.ini"
 				echo "date.timezone=$TIMEZONE" >> "./bin/php5/bin/php.ini"
 				echo "short_open_tag=0" >> "./bin/php5/bin/php.ini"
 				echo "asp_tags=0" >> "./bin/php5/bin/php.ini"
@@ -119,7 +132,9 @@ else
 				echo -n " regenerating php.ini..."
 				TIMEZONE=$(date +%Z)
 				OPCACHE_PATH="$(find $(pwd) -name opcache.so)"
-				echo "zend_extension=\"$OPCACHE_PATH\"" > "./bin/php5/bin/php.ini"
+				UOPZ_PATH="$(find $(pwd) -name uopz.so)"
+				echo "zend_extension=\"$UOPZ_PATH\"" > "./bin/php5/bin/php.ini"
+				echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini"
@@ -154,7 +169,9 @@ else
 				echo -n " regenerating php.ini..."
 				TIMEZONE=$(date +%Z)
 				OPCACHE_PATH="$(find $(pwd) -name opcache.so)"
-				echo "zend_extension=\"$OPCACHE_PATH\"" > "./bin/php5/bin/php.ini"
+				UOPZ_PATH="$(find $(pwd) -name uopz.so)"
+				echo "zend_extension=\"$UOPZ_PATH\"" > "./bin/php5/bin/php.ini"
+				echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini"
@@ -182,7 +199,9 @@ else
 			if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then
 				echo -n " regenerating php.ini..."
 				OPCACHE_PATH="$(find $(pwd) -name opcache.so)"
-				echo "zend_extension=\"$OPCACHE_PATH\"" > "./bin/php5/bin/php.ini"
+				UOPZ_PATH="$(find $(pwd) -name uopz.so)"
+				echo "zend_extension=\"$UOPZ_PATH\"" > "./bin/php5/bin/php.ini"
+				echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini"
@@ -216,7 +235,9 @@ else
 			if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then
 				echo -n " regenerating php.ini..."
 				OPCACHE_PATH="$(find $(pwd) -name opcache.so)"
-				echo "zend_extension=\"$OPCACHE_PATH\"" > "./bin/php5/bin/php.ini"
+				UOPZ_PATH="$(find $(pwd) -name uopz.so)"
+				echo "zend_extension=\"$UOPZ_PATH\"" > "./bin/php5/bin/php.ini"
+				echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini"
 				echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini"
@@ -239,7 +260,7 @@ else
 		if [ "$alldone" == "no" ]; then
 			set -e
 			echo "[3/3] no build found, compiling PHP"
-			exec ./src/build/compile.sh
+			exec "$COMPILE_SCRIPT"
 		fi
 	fi
 fi

src/pocketmine/PocketMine.php

@@ -319,6 +319,10 @@ namespace pocketmine {
 		}
 	}
 
+	if(!extension_loaded("uopz")){
+		console("[NOTICE] Couldn't find the uopz extension. Some functions may be limited", true, true, 0);
+	}
+
 	if(!extension_loaded("curl")){
 		console("[ERROR] Unable to find the cURL extension.", true, true, 0);
 		++$errors;