From cf2c9188309b591efc3800c8dabf1e31df82e8ac Mon Sep 17 00:00:00 2001 From: faissaloux Date: Sat, 18 Nov 2023 23:02:07 +0100 Subject: [PATCH 1/3] fix NodeScopeResolver 9th argument --- composer.json | 2 +- src/PHPStanAnalyser.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2ef567a..ecd1e4b 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "license": "MIT", "require": { "php": "^8.1", - "phpstan/phpstan": "^1.10.37", + "phpstan/phpstan": "^1.10.42", "tomasvotruba/type-coverage": "^0.2.1", "pestphp/pest-plugin": "^2.1.1" }, diff --git a/src/PHPStanAnalyser.php b/src/PHPStanAnalyser.php index cb4040f..e84a910 100644 --- a/src/PHPStanAnalyser.php +++ b/src/PHPStanAnalyser.php @@ -17,6 +17,7 @@ use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider; use PHPStan\File\FileHelper; use PHPStan\Php\PhpVersion; +use PHPStan\Reflection\SignatureMap\SignatureMapProvider; use PHPStan\PhpDoc\PhpDocInheritanceResolver; use PHPStan\PhpDoc\StubPhpDocProvider; use PHPStan\Reflection\InitializerExprTypeResolver; @@ -56,6 +57,7 @@ public static function make(Container $container, array $rules, array $collector $container->getByType(FileTypeMapper::class), $container->getByType(StubPhpDocProvider::class), $container->getByType(PhpVersion::class), + $container->getByType(SignatureMapProvider::class), $container->getByType(PhpDocInheritanceResolver::class), $container->getByType(FileHelper::class), $typeSpecifier, // @phpstan-ignore-line From 0c7622ef2792e568dd9082d8ee900a9d7982098d Mon Sep 17 00:00:00 2001 From: faissaloux Date: Sat, 18 Nov 2023 23:21:02 +0100 Subject: [PATCH 2/3] fix code style --- src/PHPStanAnalyser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PHPStanAnalyser.php b/src/PHPStanAnalyser.php index e84a910..fe0c702 100644 --- a/src/PHPStanAnalyser.php +++ b/src/PHPStanAnalyser.php @@ -17,11 +17,11 @@ use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider; use PHPStan\File\FileHelper; use PHPStan\Php\PhpVersion; -use PHPStan\Reflection\SignatureMap\SignatureMapProvider; use PHPStan\PhpDoc\PhpDocInheritanceResolver; use PHPStan\PhpDoc\StubPhpDocProvider; use PHPStan\Reflection\InitializerExprTypeResolver; use PHPStan\Reflection\ReflectionProvider; +use PHPStan\Reflection\SignatureMap\SignatureMapProvider; use PHPStan\Rules\DirectRegistry; use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider; use PHPStan\Rules\Rule; From 80d0918ff0e4fb4d941b3aeb2241dfeab11cd77e Mon Sep 17 00:00:00 2001 From: Sandro Gehri Date: Tue, 21 Nov 2023 13:05:21 +0100 Subject: [PATCH 3/3] Adhere to NodeScopeResolver changes in PHPStan v1.10.43 --- composer.json | 2 +- src/PHPStanAnalyser.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ecd1e4b..427a563 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "license": "MIT", "require": { "php": "^8.1", - "phpstan/phpstan": "^1.10.42", + "phpstan/phpstan": "^1.10.43", "tomasvotruba/type-coverage": "^0.2.1", "pestphp/pest-plugin": "^2.1.1" }, diff --git a/src/PHPStanAnalyser.php b/src/PHPStanAnalyser.php index fe0c702..95b4adc 100644 --- a/src/PHPStanAnalyser.php +++ b/src/PHPStanAnalyser.php @@ -68,6 +68,7 @@ public static function make(Container $container, array $rules, array $collector true, [], [], + [], true, true, false,