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

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-01-07 20:16:35 +00:00
commit 75fc7a2d1f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
39 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.php-cs-fixer.php
View File

@ -74,6 +74,7 @@ return (new PhpCsFixer\Config)
'return_type_declaration' => [ 'return_type_declaration' => [
'space_before' => 'one' 'space_before' => 'one'
], ],
'single_blank_line_at_eof' => true,
'single_import_per_statement' => true, 'single_import_per_statement' => true,
'strict_param' => true, 'strict_param' => true,
'unary_operator_spaces' => true, 'unary_operator_spaces' => true,

1
build/generate-registry-annotations.php
View File

@ -116,4 +116,3 @@ foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($argv[1],
echo "No changes made to file $file\n"; echo "No changes made to file $file\n";
} }
} }

2
composer.json
View File

@ -53,7 +53,7 @@
"webmozart/path-util": "^2.3" "webmozart/path-util": "^2.3"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "1.3.1", "phpstan/phpstan": "1.3.3",
"phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-phpunit": "^1.0.0",
"phpstan/phpstan-strict-rules": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.0.0",
"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": "8b6fac2b9bbfe685d654ed417713d894", "content-hash": "934b70469f9dcb4c9697f69e6c4a9ec5",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1900,16 +1900,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.3.1", "version": "1.3.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "c3e7a5837829b3cd5907b895da73a4da084a9f8f" "reference": "151a51f6149855785fbd883e79768c0abc96b75f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c3e7a5837829b3cd5907b895da73a4da084a9f8f", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/151a51f6149855785fbd883e79768c0abc96b75f",
"reference": "c3e7a5837829b3cd5907b895da73a4da084a9f8f", "reference": "151a51f6149855785fbd883e79768c0abc96b75f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1940,7 +1940,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/1.3.1" "source": "https://github.com/phpstan/phpstan/tree/1.3.3"
}, },
"funding": [ "funding": [
{ {
@ -1960,7 +1960,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-04T17:12:37+00:00" "time": "2022-01-07T09:49:03+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",