diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8291fd54c..746a5c505 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: image: [ubuntu-20.04] - php: [7.4.13] + php: [7.4.15] steps: - uses: actions/checkout@v2 #needed for build.sh @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.4.13] + php: [7.4.15] steps: - uses: actions/checkout@v2 @@ -87,7 +87,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.4.13] + php: [7.4.15] steps: - uses: actions/checkout@v2 @@ -137,7 +137,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.4.13] + php: [7.4.15] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 1c02cb9ed..bff7e31be 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,12 @@ A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP

-![CI](https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg) -[![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) -[![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) -[![Discord](https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord)](https://discord.gg/bmSAZBG) +

+ CI + GitHub tag (latest semver) + Docker image version (latest semver) + Discord +

## Getting started - [Documentation](http://pmmp.readthedocs.org/) diff --git a/composer.json b/composer.json index 8c82ca36e..37cc25bd2 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "respect/validation": "^2.0" }, "require-dev": { - "phpstan/phpstan": "0.12.71", + "phpstan/phpstan": "0.12.74", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index 8129a33e7..c85f99b9c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2032ba311a20918843c0cbffdc6058e4", + "content-hash": "0cdfe5ec21f19c4a00fe1ae40ede785e", "packages": [ { "name": "adhocore/json-comment", @@ -1579,16 +1579,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.71", + "version": "0.12.74", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5" + "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5", - "reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bc5f9483c8f461c86653dcbd040cf0d2778c91a2", + "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2", "shasum": "" }, "require": { @@ -1619,7 +1619,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "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": [ { @@ -1635,7 +1635,7 @@ "type": "tidelift" } ], - "time": "2021-02-01T18:24:00+00:00" + "time": "2021-02-08T15:00:25+00:00" }, { "name": "phpstan/phpstan-phpunit", diff --git a/tests/gh-actions/build.sh b/tests/gh-actions/build.sh index 344894a83..71539a93a 100755 --- a/tests/gh-actions/build.sh +++ b/tests/gh-actions/build.sh @@ -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 '"morton",,"https://github.com/pmmp/ext-morton.git",,,"extension",' >> share/php-build/extension/definition PHP_BUILD_INSTALL_EXTENSION="\ -pthreads=@2bcd8b8c10395d58b8a9bc013e3a5328080c867f \ -yaml=2.2.0 \ +pthreads=@acc6e52b2144c61c434b62a3cb680d537e06828e \ +yaml=2.2.1 \ leveldb=@2e3f740b55af1eb6dfc648dd451bcb7d6151c26c \ chunkutils2=@5a4dcd6ed74e0db2ca9a54948d4f3a065e386db5 \ morton=@0.1.2 \