More verbose type descriptions in case of numeric-string

ondrejmirtes · ondrejmirtes · commit 91dc93564e72 · 2020-08-25T17:16:00.000+02:00
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -9,6 +9,7 @@
 use PHPStan\Reflection\TrivialParametersAcceptor;
 use PHPStan\Reflection\Type\IntersectionTypeMethodReflection;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\Accessory\AccessoryType;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
@@ -132,7 +133,7 @@ function () use ($level): string {
 			function () use ($level): string {
 				$typeNames = [];
 				foreach ($this->types as $type) {
-					if ($type instanceof AccessoryType) {
+					if ($type instanceof AccessoryType && !$type instanceof AccessoryNumericStringType) {
 						continue;
 					}
 					$typeNames[] = $type->describe($level);
diff --git a/src/Type/VerbosityLevel.php b/src/Type/VerbosityLevel.php
@@ -2,6 +2,8 @@
 
 namespace PHPStan\Type;
 
+use PHPStan\Type\Accessory\AccessoryNumericStringType;
+
 class VerbosityLevel
 {
 
@@ -58,6 +60,10 @@ public static function getRecommendedLevelByType(Type $type): self
 				$moreVerbose = true;
 				return $type;
 			}
+			if ($type instanceof AccessoryNumericStringType) {
+				$moreVerbose = true;
+				return $type;
+			}
 			return $traverse($type);
 		});
 
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -467,6 +467,14 @@ public function testCallMethods(): void
 				'Parameter #1 $members of method Test\ParameterTypeCheckVerbosity::doBar() expects array<array(\'id\' => string, \'code\' => string)>, array<array(\'code\' => string)> given.',
 				1589,
 			],
+			[
+				'Parameter #1 $test of method Test\NumericStringParam::sayHello() expects string&numeric, 123 given.',
+				1657,
+			],
+			[
+				'Parameter #1 $test of method Test\NumericStringParam::sayHello() expects string&numeric, \'abc\' given.',
+				1658,
+			],
 		]);
 	}
 
@@ -728,6 +736,14 @@ public function testCallMethodsOnThisOnly(): void
 				'Parameter #1 $members of method Test\ParameterTypeCheckVerbosity::doBar() expects array<array(\'id\' => string, \'code\' => string)>, array<array(\'code\' => string)> given.',
 				1589,
 			],
+			[
+				'Parameter #1 $test of method Test\NumericStringParam::sayHello() expects string&numeric, 123 given.',
+				1657,
+			],
+			[
+				'Parameter #1 $test of method Test\NumericStringParam::sayHello() expects string&numeric, \'abc\' given.',
+				1658,
+			],
 		]);
 	}
 
diff --git a/tests/PHPStan/Rules/Methods/data/call-methods.php b/tests/PHPStan/Rules/Methods/data/call-methods.php
@@ -1640,3 +1640,23 @@ public function doFoo(array $params)
 	}
 
 }
+
+class NumericStringParam
+{
+
+	/**
+	 * @param numeric-string $test
+	 */
+	public function sayHello(string $test): void
+	{
+
+	}
+
+	public function doFoo()
+	{
+		$this->sayHello(123);
+		$this->sayHello('abc');
+		$this->sayHello('123');
+	}
+
+}
