mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '8e1b3ed'

Browse Source 
# Conflicts:
#	phpstan.neon.dist
#	resources/vanilla
#	tests/phpstan/configs/phpstan-bugs.neon
#	tests/phpstan/configs/phpunit-wiring-tests.neon
#	tests/phpstan/configs/pthreads-bugs.neon
#	tests/phpstan/configs/runtime-type-checks.neon
This commit is contained in:
Dylan K. Taylor
2020-04-25 12:35:30 +01:00
parent bb8ef3ff6d 8e1b3edd2c
commit 040fdc2875
10 changed files with 203 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
composer.lock generated
View File

@ -722,11 +722,11 @@
"packages-dev": [
{
"name": "irstea/phpunit-shim",
"version": "8.5.3",
"version": "8.5.4",
"source": {
"type": "git",
"url": "https://gitlab.irstea.fr/pole-is/tools/phpunit-shim.git",
"reference": "b55d058d7ad3cf516068f22138a5b8fb724605db"
"reference": "25b3ffe1502bfd35d5cd23dc37f2f2e70cdf0b54"
},
"require": {
"ext-dom": "*",
@ -772,7 +772,7 @@
"testing",
"xunit"
],
"time": "2020-04-01T02:21:12+00:00"
"time": "2020-04-24T02:20:21+00:00"
},
{
"name": "phpstan/phpstan",