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

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-01-16 19:44:15 +00:00
commit 487b5dd11d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
7 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/main.yml vendored
View File

@ -33,6 +33,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
fail-fast: false
matrix: matrix:
php: [7.4.13] php: [7.4.13]
@ -77,6 +78,7 @@ jobs:
needs: build-php needs: build-php
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
fail-fast: false
matrix: matrix:
php: [7.4.13] php: [7.4.13]
@ -121,6 +123,7 @@ jobs:
needs: build-php needs: build-php
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
fail-fast: false
matrix: matrix:
php: [7.4.13] php: [7.4.13]

2
build/php

@ -1 +1 @@
Subproject commit bdce80c6c2e64524b6de56772c16096679abfc8f Subproject commit d2d56be408386c5a4be787809e3a94eb81d054b6

2
composer.json
View File

@ -50,7 +50,7 @@
"composer-runtime-api": "^2.0" "composer-runtime-api": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.66", "phpstan/phpstan": "0.12.67",
"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"

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": "37fd93c9897468e5d8683a546ebaf8b6", "content-hash": "87788eccf53392e9d2bd3345ad9f9c99",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1521,16 +1521,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.66", "version": "0.12.67",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e" "reference": "ced7a5d9c5dba908c1c00cea3f1d4ad74da71b86"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/4110a2425c6bd53acbdfcda07885e87b66e9ba3e", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ced7a5d9c5dba908c1c00cea3f1d4ad74da71b86",
"reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e", "reference": "ced7a5d9c5dba908c1c00cea3f1d4ad74da71b86",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1561,7 +1561,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.66" "source": "https://github.com/phpstan/phpstan/tree/0.12.67"
}, },
"funding": [ "funding": [
{ {
@ -1577,7 +1577,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-11T16:43:15+00:00" "time": "2021-01-14T14:16:19+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

12
src/plugin/PluginManager.php
View File

@ -459,8 +459,16 @@ class PluginManager{
continue; continue;
} }
$eventClass = $parameters[0]->getClass(); $paramType = $parameters[0]->getType();
if($eventClass === null or !$eventClass->isSubclassOf(Event::class)){ //isBuiltin() returns false for builtin classes ..................
if($paramType instanceof \ReflectionNamedType && !$paramType->isBuiltin()){
/** @phpstan-var class-string $paramClass */
$paramClass = $paramType->getName();
$eventClass = new \ReflectionClass($paramClass);
if(!$eventClass->isSubclassOf(Event::class)){
continue;
}
}else{
continue; continue;
} }

1
src/world/format/io/WorldProviderManager.php
View File

@ -85,7 +85,6 @@ final class WorldProviderManager{
throw new \InvalidArgumentException("Alias \"$name\" is already assigned"); throw new \InvalidArgumentException("Alias \"$name\" is already assigned");
} }
/** @var WorldProvider $class */
$this->providers[$name] = $class; $this->providers[$name] = $class;
} }

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

@ -69,3 +69,5 @@ git submodule update --init --recursive
make -j8 install make -j8 install
echo "extension=crypto.so" >> "$INSTALL_DIR/etc/conf.d/crypto.ini" echo "extension=crypto.so" >> "$INSTALL_DIR/etc/conf.d/crypto.ini"
cd .. cd ..
rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true