Merge branch 'stable' of github.com:pmmp/PocketMine-MP into stable

This commit is contained in:
Dylan K. Taylor 2023-05-30 14:17:21 +01:00
commit a897bdfaa0
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 10 additions and 10 deletions

View File

@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup PHP and tools - name: Setup PHP and tools
uses: shivammathur/setup-php@2.24.0 uses: shivammathur/setup-php@2.25.2
with: with:
php-version: 8.1 php-version: 8.1

View File

@ -18,7 +18,7 @@ jobs:
submodules: true submodules: true
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@2.24.0 uses: shivammathur/setup-php@2.25.2
with: with:
php-version: 8.1 php-version: 8.1

View File

@ -203,7 +203,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup PHP and tools - name: Setup PHP and tools
uses: shivammathur/setup-php@2.24.0 uses: shivammathur/setup-php@2.25.2
with: with:
php-version: 8.1 php-version: 8.1
tools: php-cs-fixer:3.16 tools: php-cs-fixer:3.16

@ -1 +1 @@
Subproject commit f860ade30acc074a98bbf5ff286f35b5eda10c86 Subproject commit f2ece7b30d0364eebf1d79497003cfda1dc41aa8

12
composer.lock generated
View File

@ -1794,16 +1794,16 @@
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",
"version": "1.3.11", "version": "1.3.13",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git", "url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c" "reference": "d8bdab0218c5eb0964338d24a8511b65e9c94fa5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c", "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/d8bdab0218c5eb0964338d24a8511b65e9c94fa5",
"reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c", "reference": "d8bdab0218c5eb0964338d24a8511b65e9c94fa5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1840,9 +1840,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/1.3.11" "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.13"
}, },
"time": "2023-03-25T19:42:13+00:00" "time": "2023-05-26T11:05:59+00:00"
}, },
{ {
"name": "phpstan/phpstan-strict-rules", "name": "phpstan/phpstan-strict-rules",