Merge commit '8e1b3ed'

# Conflicts:
#	phpstan.neon.dist
#	resources/vanilla
#	tests/phpstan/configs/phpstan-bugs.neon
#	tests/phpstan/configs/phpunit-wiring-tests.neon
#	tests/phpstan/configs/pthreads-bugs.neon
#	tests/phpstan/configs/runtime-type-checks.neon
This commit is contained in:
Dylan K. Taylor
2020-04-25 12:35:30 +01:00
10 changed files with 203 additions and 182 deletions

View File

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