From ddfe828445b15a8c6ecdff5ab6808eb586111a74 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Thu, 31 Aug 2017 20:27:05 +0100
Subject: [PATCH] Require PHP 7.2, bump PocketMine-MP version to 1.7dev

---
 .travis.yml                                          | 12 ++++++++++--
 src/pocketmine/PocketMine.php                        | 12 ++++++------
 src/pocketmine/Thread.php                            |  2 +-
 src/pocketmine/Worker.php                            |  2 +-
 .../object/{Object.php => PopulatorObject.php}       |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)
 rename src/pocketmine/level/generator/object/{Object.php => PopulatorObject.php} (96%)

diff --git a/.travis.yml b/.travis.yml
index cd6d65dad..93cc404ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,20 @@
 language: php
 
 php:
- - 7.0
+ - 7.2
 
 before_script:
- - pecl install channel://pecl.php.net/pthreads-3.1.6
+# - 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
+ - git clone https://github.com/krakjoe/pthreads.git --depth=1
+ - cd pthreads
+ - phpize
+ - ./configure
+ - make
+ - make install
+ - cd ..
+ - echo "extension=pthreads.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 script:
  - ./tests/travis.sh
diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index 18d83f72b..71d647fda 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -78,9 +78,9 @@ namespace pocketmine {
 	use pocketmine\wizard\SetupWizard;
 	use raklib\RakLib;
 
-	const VERSION = "1.6.2dev";
+	const VERSION = "1.7dev";
 	const API_VERSION = "3.0.0-ALPHA7";
-	const CODENAME = "Unleashed";
+	const CODENAME = "[REDACTED]";
 
 	/*
 	 * Startup code. Do not look at it, it may harm you.
@@ -89,8 +89,8 @@ namespace pocketmine {
 	 * Enjoy it as much as I did writing it. I don't want to do it again.
 	 */
 
-	if(version_compare("7.0", PHP_VERSION) > 0 or version_compare("7.1", PHP_VERSION) <= 0){
-		echo "[CRITICAL] You must use PHP 7.0" . PHP_EOL;
+	if(version_compare("7.2", PHP_VERSION) > 0){
+		echo "[CRITICAL] You must use PHP >= 7.2" . PHP_EOL;
 		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
 		exit(1);
 	}
@@ -431,8 +431,8 @@ namespace pocketmine {
 		if(substr_count($pthreads_version, ".") < 2){
 			$pthreads_version = "0.$pthreads_version";
 		}
-		if(version_compare($pthreads_version, "3.1.5") < 0){
-			$logger->critical("pthreads >= 3.1.5 is required, while you have $pthreads_version.");
+		if(version_compare($pthreads_version, "3.1.7-dev") < 0){
+			$logger->critical("pthreads >= 3.1.7-dev is required, while you have $pthreads_version.");
 			++$errors;
 		}
 
diff --git a/src/pocketmine/Thread.php b/src/pocketmine/Thread.php
index 1f1be497c..b6a4d2b62 100644
--- a/src/pocketmine/Thread.php
+++ b/src/pocketmine/Thread.php
@@ -60,7 +60,7 @@ abstract class Thread extends \Thread{
 		}
 	}
 
-	public function start(int $options = PTHREADS_INHERIT_ALL){
+	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
 		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
diff --git a/src/pocketmine/Worker.php b/src/pocketmine/Worker.php
index 85e3dedf9..f9ade5071 100644
--- a/src/pocketmine/Worker.php
+++ b/src/pocketmine/Worker.php
@@ -61,7 +61,7 @@ abstract class Worker extends \Worker{
 		}
 	}
 
-	public function start(int $options = PTHREADS_INHERIT_ALL){
+	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
 		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
diff --git a/src/pocketmine/level/generator/object/Object.php b/src/pocketmine/level/generator/object/PopulatorObject.php
similarity index 96%
rename from src/pocketmine/level/generator/object/Object.php
rename to src/pocketmine/level/generator/object/PopulatorObject.php
index 0abf2a355..8714c0d89 100644
--- a/src/pocketmine/level/generator/object/Object.php
+++ b/src/pocketmine/level/generator/object/PopulatorObject.php
@@ -27,6 +27,6 @@ declare(strict_types=1);
 namespace pocketmine\level\generator\object;
 
 
-abstract class Object{
+abstract class PopulatorObject{
 
 }
\ No newline at end of file