make use of ConstantTypeHelper

Author: TomasVotruba

src/Type/Nette/JsonDecodeDynamicReturnTypeExtension.php

@@ -13,6 +13,7 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\ConstantTypeHelper;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
@@ -117,27 +118,29 @@ private function resolveConstantStringType(ConstantStringType $constantStringTyp
 			$decodedValue = Json::decode($constantStringType->getValue());
 		}
 
-		if (is_bool($decodedValue)) {
-			return new BooleanType();
-		}
-
-		if (is_array($decodedValue)) {
-			return new ArrayType(new MixedType(), new MixedType());
-		}
-
-		if (is_object($decodedValue) && get_class($decodedValue) === stdClass::class) {
-			return new ObjectType(stdClass::class);
-		}
-
-		if (is_int($decodedValue)) {
-			return new IntegerType();
-		}
-
-		if (is_float($decodedValue)) {
-			return new FloatType();
-		}
-
-		return new MixedType();
+		return ConstantTypeHelper::getTypeFromValue($decodedValue);
+//
+//		if (is_bool($decodedValue)) {
+//			return new BooleanType();
+//		}
+//
+//		if (is_array($decodedValue)) {
+//			return new ArrayType(new MixedType(), new MixedType());
+//		}
+//
+//		if (is_object($decodedValue) && get_class($decodedValue) === stdClass::class) {
+//			return new ObjectType(stdClass::class);
+//		}
+//
+//		if (is_int($decodedValue)) {
+//			return new IntegerType();
+//		}
+//
+//		if (is_float($decodedValue)) {
+//			return new FloatType();
+//		}
+//
+//		return new MixedType();
 	}
 
 }

tests/Type/Nette/data/json_decode.php

@@ -4,16 +4,16 @@
 use function PHPStan\Testing\assertType;
 
 $value = Json::decode('true');
-assertType('bool', $value);
+assertType('true', $value);
 
 $value = Json::decode('1');
-assertType('int', $value);
+assertType('1', $value);
 
 $value = Json::decode('1.5');
-assertType('float', $value);
+assertType('1.5', $value);
 
 $value = Json::decode('false');
-assertType('bool', $value);
+assertType('false', $value);
 
 function unknownType($mixed) {
 	$value = Json::decode($mixed);

tests/Type/Nette/data/json_decode_force_array.php

@@ -4,19 +4,19 @@
 use function PHPStan\Testing\assertType;
 
 $value = Json::decode('true', Json::FORCE_ARRAY);
-assertType('bool', $value);
+assertType('true', $value);
 
 $value = Json::decode('1', Json::FORCE_ARRAY);
-assertType('int', $value);
+assertType('1', $value);
 
 $value = Json::decode('1.5', Json::FORCE_ARRAY);
-assertType('float', $value);
+assertType('1.5', $value);
 
 $value = Json::decode('false', Json::FORCE_ARRAY);
-assertType('bool', $value);
+assertType('false', $value);
 
 $value = Json::decode('{}', Json::FORCE_ARRAY);
-assertType('array', $value);
+assertType('array{}', $value);
 
 
 function unknownType($mixed) {