mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-13 23:00:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-02-11 16:42:23 +00:00
commit 7573a01b17
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/main.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
strategy: strategy:
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [7.4.13] php: [7.4.15]
steps: steps:
- uses: actions/checkout@v2 #needed for build.sh - uses: actions/checkout@v2 #needed for build.sh
@ -37,7 +37,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [7.4.13] php: [7.4.15]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -87,7 +87,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [7.4.13] php: [7.4.15]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -137,7 +137,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [7.4.13] php: [7.4.15]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

10
README.md
View File

@ -3,10 +3,12 @@
<b>A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP</b> <b>A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP</b>
</p> </p>
![CI](https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg) <p align="center">
[![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/pmmp/PocketMine-MP?label=release&logo=github)](https://github.com/pmmp/PocketMine-MP/releases) <img src="https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg" alt="CI" />
[![Docker Image Version (latest semver)](https://img.shields.io/docker/v/pmmp/pocketmine-mp?logo=docker&label=image)](https://hub.docker.com/r/pmmp/pocketmine-mp) <a href="https://github.com/pmmp/PocketMine-MP/releases"><img src="https://img.shields.io/github/v/tag/pmmp/PocketMine-MP?label=release&logo=github" alt="GitHub tag (latest semver)" /></a>
[![Discord](https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord)](https://discord.gg/bmSAZBG) <a href="https://hub.docker.com/r/pmmp/pocketmine-mp"><img src="https://img.shields.io/docker/v/pmmp/pocketmine-mp?logo=docker&label=image" alt="Docker image version (latest semver)" /></a>
<a href="https://discord.gg/bmSAZBG"><img src="https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord" alt="Discord" /></a>
</p>
## Getting started ## Getting started
- [Documentation](http://pmmp.readthedocs.org/) - [Documentation](http://pmmp.readthedocs.org/)

2
composer.json
View File

@ -49,7 +49,7 @@
"respect/validation": "^2.0" "respect/validation": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.71", "phpstan/phpstan": "0.12.74",
"phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2", "phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2" "phpunit/phpunit": "^9.2"

14
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": "2032ba311a20918843c0cbffdc6058e4", "content-hash": "0cdfe5ec21f19c4a00fe1ae40ede785e",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1579,16 +1579,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.71", "version": "0.12.74",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5" "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bc5f9483c8f461c86653dcbd040cf0d2778c91a2",
"reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5", "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1619,7 +1619,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.71" "source": "https://github.com/phpstan/phpstan/tree/0.12.74"
}, },
"funding": [ "funding": [
{ {
@ -1635,7 +1635,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-01T18:24:00+00:00" "time": "2021-02-08T15:00:25+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

4
tests/gh-actions/build.sh
View File

@ -50,8 +50,8 @@ echo '"leveldb",,"https://github.com/pmmp/php-leveldb.git",,"--with-leveldb='$IN
echo '"chunkutils2",,"https://github.com/pmmp/ext-chunkutils2.git",,,"extension",' >> share/php-build/extension/definition echo '"chunkutils2",,"https://github.com/pmmp/ext-chunkutils2.git",,,"extension",' >> share/php-build/extension/definition
echo '"morton",,"https://github.com/pmmp/ext-morton.git",,,"extension",' >> share/php-build/extension/definition echo '"morton",,"https://github.com/pmmp/ext-morton.git",,,"extension",' >> share/php-build/extension/definition
PHP_BUILD_INSTALL_EXTENSION="\ PHP_BUILD_INSTALL_EXTENSION="\
pthreads=@2bcd8b8c10395d58b8a9bc013e3a5328080c867f \ pthreads=@acc6e52b2144c61c434b62a3cb680d537e06828e \
yaml=2.2.0 \ yaml=2.2.1 \
leveldb=@2e3f740b55af1eb6dfc648dd451bcb7d6151c26c \ leveldb=@2e3f740b55af1eb6dfc648dd451bcb7d6151c26c \
chunkutils2=@5a4dcd6ed74e0db2ca9a54948d4f3a065e386db5 \ chunkutils2=@5a4dcd6ed74e0db2ca9a54948d4f3a065e386db5 \
morton=@0.1.2 \ morton=@0.1.2 \