Fix is_numeric issues

ondrejmirtes · ondrejmirtes · commit 337fbeebe070 · 2020-03-17T13:28:07.000+01:00
diff --git a/src/Type/Php/IsNumericFunctionTypeSpecifyingExtension.php b/src/Type/Php/IsNumericFunctionTypeSpecifyingExtension.php
@@ -12,6 +12,7 @@
 use PHPStan\Type\FloatType;
 use PHPStan\Type\FunctionTypeSpecifyingExtension;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\MixedType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\UnionType;
 
@@ -35,7 +36,7 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 		}
 
 		$argType = $scope->getType($node->args[0]->value);
-		if ((new StringType())->isSuperTypeOf($argType)->yes()) {
+		if ($context->truthy() && !(new StringType())->isSuperTypeOf($argType)->no() && !$argType instanceof MixedType) {
 			return new SpecifiedTypes([], []);
 		}
 
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -9815,6 +9815,11 @@ public function dataArrowFunctionReturnTypeInference(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/arrow-function-return-type.php');
 	}
 
+	public function dataIsNumeric(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/is-numeric.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -9849,6 +9854,7 @@ public function dataArrowFunctionReturnTypeInference(): array
 	 * @dataProvider dataIteratorToArray
 	 * @dataProvider dataExtDs
 	 * @dataProvider dataArrowFunctionReturnTypeInference
+	 * @dataProvider dataIsNumeric
 	 * @param ConstantStringType $expectedType
 	 * @param Type $actualType
 	 */
diff --git a/tests/PHPStan/Analyser/data/is-numeric.php b/tests/PHPStan/Analyser/data/is-numeric.php
@@ -0,0 +1,9 @@
+<?php
+
+function () {
+	/** @var int|string $s */
+	$s = doFoo();
+	if (!is_numeric($s)) {
+		\PHPStan\Analyser\assertType('string', $s);
+	}
+};
diff --git a/tests/PHPStan/Rules/Comparison/data/check-type-function-call.php b/tests/PHPStan/Rules/Comparison/data/check-type-function-call.php
@@ -700,4 +700,59 @@ public function doFoo(string $str, float $float)
 		assert(is_numeric($isNumeric));
 	}
 
+	/**
+	 * @param int|string $item
+	 */
+	public function doBar($item): void
+	{
+		if (!is_numeric($item)) {
+			throw new \Exception;
+		}
+
+		echo $item;
+	}
+
+	/**
+	 * @param string|float|int $value
+	 */
+	public function doBaz($value): void
+	{
+		if (is_numeric($value)) {
+
+		}
+	}
+
+	public  function doLorem(string $rating): ?int
+	{
+		$ratingMapping = [
+			'UR'    => 0,
+			'NR'    => 0,
+			'G'     => 0,
+			'PG'    => 8,
+			'PG-13' => 13,
+			'R'     => 15,
+			'NC-17' => 17,
+		];
+
+		if (array_key_exists($rating, $ratingMapping)) {
+			$rating = $ratingMapping[$rating];
+		}
+
+		if (is_numeric($rating)) {
+
+		}
+	}
+
+	/**
+	 * @param mixed[] $data
+	 */
+	function doIpsum(array $data): void
+	{
+		foreach ($data as $index => $element) {
+			if (is_numeric($index)) {
+				echo "numeric key\n";
+			}
+		}
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`use PHPStan\Type\FloatType;`
`13`	`13`	`use PHPStan\Type\FunctionTypeSpecifyingExtension;`
`14`	`14`	`use PHPStan\Type\IntegerType;`
	`15`	`+use PHPStan\Type\MixedType;`
`15`	`16`	`use PHPStan\Type\StringType;`
`16`	`17`	`use PHPStan\Type\UnionType;`
`17`	`18`
`@@ -35,7 +36,7 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`$argType = $scope->getType($node->args[0]->value);`
`38`		`- if ((new StringType())->isSuperTypeOf($argType)->yes()) {`
	`39`	`+ if ($context->truthy() && !(new StringType())->isSuperTypeOf($argType)->no() && !$argType instanceof MixedType) {`
`39`	`40`	`return new SpecifiedTypes([], []);`
`40`	`41`	`}`
`41`	`42`