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

Merge remote-tracking branch 'origin/stable' into minor-next

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-07-17 16:13:16 +01:00
commit 4c6b82f30a
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@ -1937,16 +1937,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "10.2.3", "version": "10.2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "35c8cac1734ede2ae354a6644f7088356ff5b08e" "reference": "15a89f123d8ca9c1e1598d6d87a56a8bf28c72cd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35c8cac1734ede2ae354a6644f7088356ff5b08e", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/15a89f123d8ca9c1e1598d6d87a56a8bf28c72cd",
"reference": "35c8cac1734ede2ae354a6644f7088356ff5b08e", "reference": "15a89f123d8ca9c1e1598d6d87a56a8bf28c72cd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2018,7 +2018,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy", "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.3" "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.5"
}, },
"funding": [ "funding": [
{ {
@ -2034,7 +2034,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-06-30T06:17:38+00:00" "time": "2023-07-14T04:18:47+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",

2
src/utils/StringToTParser.php
View File

@ -59,7 +59,7 @@ abstract class StringToTParser{
} }
/** /**
* Tries to parse the specified string into an enchantment. * Tries to parse the specified string into a corresponding instance of T.
* @phpstan-return T|null * @phpstan-return T|null
*/ */
public function parse(string $input){ public function parse(string $input){