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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-05-11 19:28:09 +01:00
commit 4c4db1836f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.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.18] php: [7.4.19]
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.18] php: [7.4.19]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -55,7 +55,7 @@ jobs:
- name: Install cached PHP's dependencies - name: Install cached PHP's dependencies
if: steps.php-build-cache.outputs.cache-hit == 'true' if: steps.php-build-cache.outputs.cache-hit == 'true'
run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh run: ./tests/gh-actions/install-dependencies.sh
- name: Prefix PHP to PATH - name: Prefix PHP to PATH
run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
@ -87,7 +87,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [7.4.18] php: [7.4.19]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -107,7 +107,7 @@ jobs:
- name: Install cached PHP's dependencies - name: Install cached PHP's dependencies
if: steps.php-build-cache.outputs.cache-hit == 'true' if: steps.php-build-cache.outputs.cache-hit == 'true'
run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh run: ./tests/gh-actions/install-dependencies.sh
- name: Prefix PHP to PATH - name: Prefix PHP to PATH
run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
@ -139,7 +139,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [7.4.18] php: [7.4.19]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -159,7 +159,7 @@ jobs:
- name: Install cached PHP's dependencies - name: Install cached PHP's dependencies
if: steps.php-build-cache.outputs.cache-hit == 'true' if: steps.php-build-cache.outputs.cache-hit == 'true'
run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh run: ./tests/gh-actions/install-dependencies.sh
- name: Prefix PHP to PATH - name: Prefix PHP to PATH
run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
@ -191,7 +191,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
image: [ubuntu-20.04] image: [ubuntu-20.04]
php: [7.4.18] php: [7.4.19]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -211,7 +211,7 @@ jobs:
- name: Install cached PHP's dependencies - name: Install cached PHP's dependencies
if: steps.php-build-cache.outputs.cache-hit == 'true' if: steps.php-build-cache.outputs.cache-hit == 'true'
run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh run: ./tests/gh-actions/install-dependencies.sh
- name: Prefix PHP to PATH - name: Prefix PHP to PATH
run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH

2
composer.json
View File

@ -51,7 +51,7 @@
"respect/validation": "^2.0" "respect/validation": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.85", "phpstan/phpstan": "0.12.86",
"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"

38
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": "91de5b8e3d1e1f64970c03e059a27f8a", "content-hash": "04e955ce26ffda03098344659abcf0e0",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -621,12 +621,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/Math.git", "url": "https://github.com/pmmp/Math.git",
"reference": "5c5ddc62725daad773d8c4eda180e6327d45b692" "reference": "4595b5ee90627e817317839519a7d482c809effb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/Math/zipball/5c5ddc62725daad773d8c4eda180e6327d45b692", "url": "https://api.github.com/repos/pmmp/Math/zipball/4595b5ee90627e817317839519a7d482c809effb",
"reference": "5c5ddc62725daad773d8c4eda180e6327d45b692", "reference": "4595b5ee90627e817317839519a7d482c809effb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -636,7 +636,7 @@
"require-dev": { "require-dev": {
"irstea/phpunit-shim": "^8.5 || ^9.5", "irstea/phpunit-shim": "^8.5 || ^9.5",
"phpstan/extension-installer": "^1.0", "phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "0.12.67", "phpstan/phpstan": "0.12.80",
"phpstan/phpstan-strict-rules": "^0.12.4" "phpstan/phpstan-strict-rules": "^0.12.4"
}, },
"type": "library", "type": "library",
@ -654,7 +654,7 @@
"issues": "https://github.com/pmmp/Math/issues", "issues": "https://github.com/pmmp/Math/issues",
"source": "https://github.com/pmmp/Math/tree/master" "source": "https://github.com/pmmp/Math/tree/master"
}, },
"time": "2021-01-15T14:25:59+00:00" "time": "2021-05-10T10:44:46+00:00"
}, },
{ {
"name": "pocketmine/nbt", "name": "pocketmine/nbt",
@ -1835,16 +1835,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.85", "version": "0.12.86",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03" "reference": "a84fdc53ecca7643dbc89ef8880d8b393a6c155a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/20e6333c0067875ad7697cd8acdf245c6ef69d03", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a84fdc53ecca7643dbc89ef8880d8b393a6c155a",
"reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03", "reference": "a84fdc53ecca7643dbc89ef8880d8b393a6c155a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1875,7 +1875,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.85" "source": "https://github.com/phpstan/phpstan/tree/0.12.86"
}, },
"funding": [ "funding": [
{ {
@ -1891,25 +1891,25 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-27T14:13:16+00:00" "time": "2021-05-08T11:29:01+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",
"version": "0.12.18", "version": "0.12.19",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git", "url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "ab44aec7cfb5cb267b8bc30a8caea86dd50d1f72" "reference": "52f7072ddc5f81492f9d2de65a24813a48c90b18"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/ab44aec7cfb5cb267b8bc30a8caea86dd50d1f72", "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/52f7072ddc5f81492f9d2de65a24813a48c90b18",
"reference": "ab44aec7cfb5cb267b8bc30a8caea86dd50d1f72", "reference": "52f7072ddc5f81492f9d2de65a24813a48c90b18",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1 || ^8.0", "php": "^7.1 || ^8.0",
"phpstan/phpstan": "^0.12.60" "phpstan/phpstan": "^0.12.86"
}, },
"conflict": { "conflict": {
"phpunit/phpunit": "<7.0" "phpunit/phpunit": "<7.0"
@ -1944,9 +1944,9 @@
"description": "PHPUnit extensions and rules for PHPStan", "description": "PHPUnit extensions and rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues", "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
"source": "https://github.com/phpstan/phpstan-phpunit/tree/0.12.18" "source": "https://github.com/phpstan/phpstan-phpunit/tree/0.12.19"
}, },
"time": "2021-03-06T11:51:27+00:00" "time": "2021-04-30T11:10:37+00:00"
}, },
{ {
"name": "phpstan/phpstan-strict-rules", "name": "phpstan/phpstan-strict-rules",

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

@ -70,4 +70,3 @@ echo "extension=crypto.so" >> "$INSTALL_DIR/etc/conf.d/crypto.ini"
cd .. cd ..
rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true
cp install-dependencies.sh "$INSTALL_DIR"

3
tests/gh-actions/install-dependencies.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
sudo apt update && sudo apt install -y \
libzip5