Merge branch 'stable'

.github/workflows/main.yml

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

build/php

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

composer.json

@@ -50,7 +50,7 @@
       "composer-runtime-api": "^2.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "0.12.66",
+      "phpstan/phpstan": "0.12.67",
       "phpstan/phpstan-phpunit": "^0.12.6",
       "phpstan/phpstan-strict-rules": "^0.12.2",
       "phpunit/phpunit": "^9.2"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "37fd93c9897468e5d8683a546ebaf8b6",
+    "content-hash": "87788eccf53392e9d2bd3345ad9f9c99",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -1521,16 +1521,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.66",
+            "version": "0.12.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e"
+                "reference": "ced7a5d9c5dba908c1c00cea3f1d4ad74da71b86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
-                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ced7a5d9c5dba908c1c00cea3f1d4ad74da71b86",
+                "reference": "ced7a5d9c5dba908c1c00cea3f1d4ad74da71b86",
                 "shasum": ""
             },
             "require": {
@@ -1561,7 +1561,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "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": [
                 {
@@ -1577,7 +1577,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-11T16:43:15+00:00"
+            "time": "2021-01-14T14:16:19+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",

src/plugin/PluginManager.php

@@ -459,8 +459,16 @@ class PluginManager{
 					continue;
 				}
 
-				$eventClass = $parameters[0]->getClass();
-				if($eventClass === null or !$eventClass->isSubclassOf(Event::class)){
+				$paramType = $parameters[0]->getType();
+				//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;
 				}
 

src/world/format/io/WorldProviderManager.php

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

tests/gh-actions/build.sh

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