Merge branch 'stable'

phpstan.neon.dist

@@ -4,7 +4,6 @@ includes:
 	- tests/phpstan/configs/impossible-generics.neon
 	- tests/phpstan/configs/php-bugs.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
-	- tests/phpstan/configs/pthreads-bugs.neon
 	- tests/phpstan/configs/runtime-type-checks.neon
 	- tests/phpstan/configs/spl-fixed-array-sucks.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon

src/MemoryManager.php

@@ -352,7 +352,6 @@ class MemoryManager{
 		file_put_contents(Path::join($outputFolder, "staticProperties.js"), json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 		$logger->info("Wrote $staticCount static properties");
 
-		if(isset($GLOBALS)){ //This might be null if we're on a different thread
 		$globalVariables = [];
 		$globalCount = 0;
 
@@ -379,7 +378,6 @@ class MemoryManager{
 
 		file_put_contents(Path::join($outputFolder, "globalVariables.js"), json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 		$logger->info("Wrote $globalCount global variables");
-		}
 
 		foreach(get_defined_functions()["user"] as $function){
 			$reflect = new \ReflectionFunction($function);

tests/phpstan/configs/pthreads-bugs.neon

@@ -1,7 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Variable \\$GLOBALS in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 1
-			path: ../../../src/MemoryManager.php
-