From 5b7565664c0f464569936e08174a068018571846 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 7 Sep 2017 19:32:04 +0100 Subject: [PATCH 1/8] Removed WeakRef from Travis CI --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd6d65dad0..adb6125b71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ php: before_script: - pecl install channel://pecl.php.net/pthreads-3.1.6 - - pecl install channel://pecl.php.net/weakref-0.3.3 - echo | pecl install channel://pecl.php.net/yaml-2.0.0 script: From 953c1ef4ecefab2cefdba4709cb391ddcdbb4b61 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 7 Sep 2017 17:27:07 +0100 Subject: [PATCH 2/8] Fixed formatting issues in Travis test script --- tests/travis.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/travis.sh b/tests/travis.sh index 92469586da..2498e0c67a 100755 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -27,10 +27,10 @@ rm -rf ./plugins/PocketMine-DevTools echo -e "version\nmakeserver\nstop\n" | "$PHP_BINARY" src/pocketmine/PocketMine.php --no-wizard --disable-ansi --disable-readline --debug.level=2 if ls plugins/DevTools/PocketMine*.phar >/dev/null 2>&1; then - echo Server phar created successfully. + echo Server phar created successfully. else - echo No phar created! - exit 1 + echo No phar created! + exit 1 fi cp -r tests/plugins/PocketMine-TesterPlugin ./plugins @@ -44,9 +44,9 @@ fi result=$(echo "$output" | grep 'Finished' | grep -v 'PASS') if [ "$result" != "" ]; then - echo "$result" - echo Some tests did not complete successfully, changing build status to failed - exit 1 + echo "$result" + echo Some tests did not complete successfully, changing build status to failed + exit 1 else - echo All tests passed + echo All tests passed fi From 9b7868238cf88d9b74c426c28247bc75171b22c9 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 4 Feb 2017 11:34:55 +0000 Subject: [PATCH 3/8] Improved Travis Test, capture error output from console, test phar --- tests/travis.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/travis.sh b/tests/travis.sh index 2498e0c67a..17cba4d112 100755 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -18,23 +18,25 @@ if [ $? -ne 0 ]; then fi rm server.log 2> /dev/null -mkdir -p ./plugins +rm PocketMine-MP.phar 2> /dev/null -cp -r tests/plugins/PocketMine-DevTools ./plugins +cd tests/plugins/PocketMine-DevTools +"$PHP_BINARY" -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar +cd ../../.. -"$PHP_BINARY" ./plugins/PocketMine-DevTools/src/DevTools/ConsoleScript.php --make ./plugins/PocketMine-DevTools --relative ./plugins/PocketMine-DevTools --out ./plugins/DevTools.phar -rm -rf ./plugins/PocketMine-DevTools - -echo -e "version\nmakeserver\nstop\n" | "$PHP_BINARY" src/pocketmine/PocketMine.php --no-wizard --disable-ansi --disable-readline --debug.level=2 -if ls plugins/DevTools/PocketMine*.phar >/dev/null 2>&1; then +"$PHP_BINARY" -dphar.readonly=0 DevTools.phar --make src --relative ./ --entry src/pocketmine/PocketMine.php --out PocketMine-MP.phar +if [ -f PocketMine-MP.phar ]; then echo Server phar created successfully. else - echo No phar created! + echo Server phar was not created! exit 1 fi + +mkdir plugins 2> /dev/null +mv DevTools.phar plugins cp -r tests/plugins/PocketMine-TesterPlugin ./plugins -echo -e "stop\n" | "$PHP_BINARY" src/pocketmine/PocketMine.php --no-wizard --disable-ansi --disable-readline --debug.level=2 +echo -e "stop\n" | "$PHP_BINARY" PocketMine-MP.phar --no-wizard --disable-ansi --disable-readline --debug.level=2 output=$(grep '\[TesterPlugin\]' server.log) if [ "$output" == "" ]; then @@ -47,6 +49,9 @@ if [ "$result" != "" ]; then echo "$result" echo Some tests did not complete successfully, changing build status to failed exit 1 +elif [ $(grep -c "ERROR\|CRITICAL\|EMERGENCY" server.log) -ne 0 ]; then + echo Server log contains error messages, changing build status to failed + exit 1 else echo All tests passed fi From 38293913ee131640329b3cd6ac33c923f81f118f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 8 Sep 2017 20:36:32 +0100 Subject: [PATCH 4/8] Updated DevTools submodule --- tests/plugins/PocketMine-DevTools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/PocketMine-DevTools b/tests/plugins/PocketMine-DevTools index 4ade26741e..c352696e82 160000 --- a/tests/plugins/PocketMine-DevTools +++ b/tests/plugins/PocketMine-DevTools @@ -1 +1 @@ -Subproject commit 4ade26741e8050de196e4c12af01b8b42e76e6e7 +Subproject commit c352696e8251b69b55a9ec8e18b863c1d10e158c From cae1a3bb4bcbd45f5b53fe58853280c7f4d5a402 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 8 Sep 2017 21:38:14 +0100 Subject: [PATCH 5/8] Updated DevTools submodule --- tests/plugins/PocketMine-DevTools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/PocketMine-DevTools b/tests/plugins/PocketMine-DevTools index c352696e82..71194e9967 160000 --- a/tests/plugins/PocketMine-DevTools +++ b/tests/plugins/PocketMine-DevTools @@ -1 +1 @@ -Subproject commit c352696e8251b69b55a9ec8e18b863c1d10e158c +Subproject commit 71194e996747579593df640e52ece4dc14aeb078 From f1ccee505ba77850cdad9e01c2c7d0657df7c387 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 00:51:20 +0100 Subject: [PATCH 6/8] Submodule update (this is getting annoying) --- tests/plugins/PocketMine-DevTools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/PocketMine-DevTools b/tests/plugins/PocketMine-DevTools index 71194e9967..bfae42ce89 160000 --- a/tests/plugins/PocketMine-DevTools +++ b/tests/plugins/PocketMine-DevTools @@ -1 +1 @@ -Subproject commit 71194e996747579593df640e52ece4dc14aeb078 +Subproject commit bfae42ce8985204b0db276d0b8daed7050567323 From c569f559337e1ab3b4146c9bcb4f7757de1ea167 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 11:22:44 +0100 Subject: [PATCH 7/8] Fixed can't find sources when PocketMine.php is run from anywhere other than the repository root --- src/pocketmine/PocketMine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 8165359e9f..36d4278af8 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -120,7 +120,7 @@ namespace pocketmine { if(\Phar::running(true) !== ""){ define('pocketmine\PATH', \Phar::running(true) . "/"); }else{ - define('pocketmine\PATH', realpath(getcwd()) . DIRECTORY_SEPARATOR); + define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR); } $requiredSplVer = "0.0.1"; From 17d949f476002ca85cae34c7280671afd15b4693 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 11:25:59 +0100 Subject: [PATCH 8/8] Fixed SPL being reported as incompatible when it's actually not found --- src/pocketmine/PocketMine.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 36d4278af8..b039ef2d43 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -124,18 +124,17 @@ namespace pocketmine { } $requiredSplVer = "0.0.1"; - if(!is_file(\pocketmine\PATH . "src/spl/version.php") or version_compare($requiredSplVer, require(\pocketmine\PATH . "src/spl/version.php")) > 0){ + if(!is_file(\pocketmine\PATH . "src/spl/version.php")){ + echo "[CRITICAL] Cannot find PocketMine-SPL or incompatible version." . PHP_EOL; + echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL; + exit(1); + }elseif(version_compare($requiredSplVer, require(\pocketmine\PATH . "src/spl/version.php")) > 0){ echo "[CRITICAL] Incompatible PocketMine-SPL submodule version ($requiredSplVer is required)." . PHP_EOL; echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL; exit(1); } if(!class_exists("ClassLoader", false)){ - if(!is_file(\pocketmine\PATH . "src/spl/ClassLoader.php")){ - echo "[CRITICAL] Unable to find the PocketMine-SPL library." . PHP_EOL; - echo "[CRITICAL] Please use provided builds or clone the repository recursively." . PHP_EOL; - exit(1); - } require_once(\pocketmine\PATH . "src/spl/ClassLoader.php"); require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php"); }