Merge branch 'next-minor'

# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-04-19 12:56:44 +01:00
commit 766a2178a0
5 changed files with 5 additions and 6 deletions

View File

@ -2,7 +2,6 @@ dist: xenial
language: php language: php
php: php:
- 7.2
- 7.3 - 7.3
before_script: before_script:

View File

@ -2,7 +2,7 @@
## Pre-requisites ## Pre-requisites
- A bash shell (git bash is sufficient for Windows) - A bash shell (git bash is sufficient for Windows)
- [`git`](https://git-scm.com) available in your shell - [`git`](https://git-scm.com) available in your shell
- PHP 7.2 or newer available in your shell - PHP 7.3 or newer available in your shell
- [`composer`](https://getcomposer.org) available in your shell - [`composer`](https://getcomposer.org) available in your shell
## Custom PHP binaries ## Custom PHP binaries

View File

@ -5,7 +5,7 @@
"homepage": "https://pmmp.io", "homepage": "https://pmmp.io",
"license": "LGPL-3.0", "license": "LGPL-3.0",
"require": { "require": {
"php": ">=7.2.0", "php": ">=7.3.0",
"php-64bit": "*", "php-64bit": "*",
"ext-bcmath": "*", "ext-bcmath": "*",
"ext-chunkutils2": "^0.1.0", "ext-chunkutils2": "^0.1.0",

4
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e13d435f1db3b942c95629a81677de51", "content-hash": "6e9e4623c329b6647deb2cc0db21328b",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -950,7 +950,7 @@
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=7.2.0", "php": ">=7.3.0",
"php-64bit": "*", "php-64bit": "*",
"ext-bcmath": "*", "ext-bcmath": "*",
"ext-chunkutils2": "^0.1.0", "ext-chunkutils2": "^0.1.0",

View File

@ -36,7 +36,7 @@ namespace pocketmine {
require_once __DIR__ . '/VersionInfo.php'; require_once __DIR__ . '/VersionInfo.php';
const MIN_PHP_VERSION = "7.2.0"; const MIN_PHP_VERSION = "7.3.0";
/** /**
* @param string $message * @param string $message