Fixed IncompatibleDefaultParameterTypeRule

phpstan · May 10, 2020 · a5beb06 · a5beb06
1 parent a66d6b1
commit a5beb06
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/Rules/Functions/IncompatibleDefaultParameterTypeRule.php b/src/Rules/Functions/IncompatibleDefaultParameterTypeRule.php
@@ -10,6 +10,7 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\Generic\TemplateTypeHelper;
 use PHPStan\Type\VerbosityLevel;
 
 /**
@@ -59,8 +60,9 @@ public function processNode(Node $node, Scope $scope): array
 
 			$defaultValueType = $scope->getType($param->default);
 			$parameterType = $parameters->getParameters()[$paramI]->getType();
+			$parameterType = TemplateTypeHelper::resolveToBounds($parameterType);
 
-			if ($parameterType->isSuperTypeOf($defaultValueType)->yes()) {
+			if ($parameterType->accepts($defaultValueType, true)->yes()) {
 				continue;
 			}
 

diff --git a/src/Rules/Methods/IncompatibleDefaultParameterTypeRule.php b/src/Rules/Methods/IncompatibleDefaultParameterTypeRule.php
@@ -9,6 +9,7 @@
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\Generic\TemplateTypeHelper;
 use PHPStan\Type\VerbosityLevel;
 
 /**
@@ -45,8 +46,9 @@ public function processNode(Node $node, Scope $scope): array
 
 			$defaultValueType = $scope->getType($param->default);
 			$parameterType = $parameters->getParameters()[$paramI]->getType();
+			$parameterType = TemplateTypeHelper::resolveToBounds($parameterType);
 
-			if ($parameterType->isSuperTypeOf($defaultValueType)->yes()) {
+			if ($parameterType->accepts($defaultValueType, true)->yes()) {
 				continue;
 			}
 

diff --git a/tests/PHPStan/Rules/Methods/data/incompatible-default-parameter-type-methods.php b/tests/PHPStan/Rules/Methods/data/incompatible-default-parameter-type-methods.php
@@ -57,3 +57,30 @@ public function bar(
 	}
 
 }
+
+class Bar
+{
+
+	/**
+	 * @param array{name?:string} $settings
+	 */
+	public function doFoo(array $settings = []): void
+	{
+
+	}
+
+	public function doBar(float $test2 = 0): void
+	{
+
+	}
+
+	/**
+	 * @template T
+	 * @param T $a
+	 */
+	public function doBaz($a = 'str'): void
+	{
+
+	}
+
+}