mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-20 16:00:20 +00:00
Code Issues Projects Releases Wiki Activity

Require PHP 7.2, bump PocketMine-MP version to 1.7dev

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-31 20:27:05 +01:00
parent b9c4a65307
commit ddfe828445
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -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

12
src/pocketmine/PocketMine.php
View File

@ -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;
}

2
src/pocketmine/Thread.php
View File

@ -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()){

2
src/pocketmine/Worker.php
View File

@ -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()){

2
src/pocketmine/level/generator/object/Object.php → src/pocketmine/level/generator/object/PopulatorObject.php
View File

@ -27,6 +27,6 @@ declare(strict_types=1);
namespace pocketmine\level\generator\object;
abstract class Object{
abstract class PopulatorObject{
}