More rules use the recommended type description verbosity level

phpstan · May 3, 2020 · d4f0907 · d4f0907
1 parent f6a37a0
commit d4f0907
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/src/Rules/Arrays/AppendedArrayItemTypeRule.php b/src/Rules/Arrays/AppendedArrayItemTypeRule.php
@@ -76,7 +76,7 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
 
 		$itemType = $assignedToType->getItemType();
 		if (!$this->ruleLevelHelper->accepts($itemType, $assignedValueType, $scope->isDeclareStrictTypes())) {
-			$verbosityLevel = $itemType->isCallable()->and($assignedValueType->isCallable())->yes() ? VerbosityLevel::value() : VerbosityLevel::typeOnly();
+			$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($itemType);
 			return [
 				RuleErrorBuilder::message(sprintf(
 					'Array (%s) does not accept %s.',

diff --git a/src/Rules/FunctionReturnTypeCheck.php b/src/Rules/FunctionReturnTypeCheck.php
@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Type\GenericTypeVariableResolver;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeUtils;
 use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\VerbosityLevel;
 use PHPStan\Type\VoidType;
@@ -58,9 +57,7 @@ public function checkReturnType(
 		}
 
 		$isVoidSuperType = (new VoidType())->isSuperTypeOf($returnType);
-		$verbosityLevel = $returnType->isCallable()->yes() || count(TypeUtils::getConstantArrays($returnType)) > 0
-			? VerbosityLevel::value()
-			: VerbosityLevel::typeOnly();
+		$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($returnType);
 		if ($returnValue === null) {
 			if (!$isVoidSuperType->no()) {
 				return [];

diff --git a/src/Rules/Functions/IncompatibleDefaultParameterTypeRule.php b/src/Rules/Functions/IncompatibleDefaultParameterTypeRule.php
@@ -64,13 +64,15 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
+			$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($parameterType);
+
 			$errors[] = RuleErrorBuilder::message(sprintf(
 				'Default value of the parameter #%d $%s (%s) of function %s() is incompatible with type %s.',
 				$paramI + 1,
 				$param->var->name,
-				$defaultValueType->describe(VerbosityLevel::value()),
+				$defaultValueType->describe($verbosityLevel),
 				$function->getName(),
-				$parameterType->describe(VerbosityLevel::value())
+				$parameterType->describe($verbosityLevel)
 			))->line($param->getLine())->build();
 		}
 

diff --git a/src/Rules/Methods/IncompatibleDefaultParameterTypeRule.php b/src/Rules/Methods/IncompatibleDefaultParameterTypeRule.php
@@ -50,14 +50,16 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
+			$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($parameterType);
+
 			$errors[] = RuleErrorBuilder::message(sprintf(
 				'Default value of the parameter #%d $%s (%s) of method %s::%s() is incompatible with type %s.',
 				$paramI + 1,
 				$param->var->name,
-				$defaultValueType->describe(VerbosityLevel::value()),
+				$defaultValueType->describe($verbosityLevel),
 				$method->getDeclaringClass()->getDisplayName(),
 				$method->getName(),
-				$parameterType->describe(VerbosityLevel::value())
+				$parameterType->describe($verbosityLevel)
 			))->line($param->getLine())->build();
 		}
 

diff --git a/src/Rules/Properties/DefaultValueTypesAssignedToPropertiesRule.php b/src/Rules/Properties/DefaultValueTypesAssignedToPropertiesRule.php
@@ -53,13 +53,15 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
+			$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($propertyType);
+
 			$errors[] = RuleErrorBuilder::message(sprintf(
 				'%s %s::$%s (%s) does not accept default value of type %s.',
 				$node->isStatic() ? 'Static property' : 'Property',
 				$classReflection->getDisplayName(),
 				$property->name->name,
-				$propertyType->describe(VerbosityLevel::typeOnly()),
-				$defaultValueType->describe(VerbosityLevel::typeOnly())
+				$propertyType->describe($verbosityLevel),
+				$defaultValueType->describe($verbosityLevel)
 			))->build();
 		}
 

diff --git a/src/Rules/Properties/TypesAssignedToPropertiesRule.php b/src/Rules/Properties/TypesAssignedToPropertiesRule.php
@@ -71,13 +71,14 @@ public function processNode(Node $node, Scope $scope): array
 		}
 		if (!$this->ruleLevelHelper->accepts($propertyType, $assignedValueType, $scope->isDeclareStrictTypes())) {
 			$propertyDescription = $this->propertyDescriptor->describeProperty($propertyReflection, $propertyFetch);
+			$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($propertyType);
 
 			return [
 				RuleErrorBuilder::message(sprintf(
 					'%s (%s) does not accept %s.',
 					$propertyDescription,
-					$propertyType->describe(VerbosityLevel::typeOnly()),
-					$assignedValueType->describe(VerbosityLevel::typeOnly())
+					$propertyType->describe($verbosityLevel),
+					$assignedValueType->describe($verbosityLevel)
 				))->build(),
 			];
 		}

diff --git a/tests/PHPStan/Rules/Arrays/AppendedArrayItemTypeRuleTest.php b/tests/PHPStan/Rules/Arrays/AppendedArrayItemTypeRuleTest.php
@@ -29,15 +29,15 @@ public function testAppendedArrayItemType(): void
 					18,
 				],
 				[
-					'Array (array<callable>) does not accept array<int, int>.',
+					'Array (array<callable(): mixed>) does not accept array(1, 2, 3).',
 					20,
 				],
 				[
-					'Array (array<callable>) does not accept array<int, string>.',
+					'Array (array<callable(): mixed>) does not accept array(\'AppendedArrayItem\\\\Foo\', \'classMethod\').',
 					23,
 				],
 				[
-					'Array (array<callable>) does not accept array<int, string>.',
+					'Array (array<callable(): mixed>) does not accept array(\'Foo\', \'Hello world\').',
 					25,
 				],
 				[