More precise strval family function signatures

Author: dravnic

resources/functionMap.php

@@ -2020,7 +2020,7 @@
 'DomXsltStylesheet::result_dump_mem' => ['string', 'xmldoc'=>'DOMDocument'],
 'DOTNET::__construct' => ['void', 'assembly_name'=>'string', 'class_name'=>'string', 'codepage='=>'int'],
 'dotnet_load' => ['int', 'assembly_name'=>'string', 'datatype_name='=>'string', 'codepage='=>'int'],
-'doubleval' => ['float', 'var'=>'mixed'],
+'doubleval' => ['float', 'var'=>'scalar|array|resource|null'],
 'Ds\Collection::clear' => ['void'],
 'Ds\Collection::copy' => ['Ds\Collection'],
 'Ds\Collection::isEmpty' => ['bool'],
@@ -2988,7 +2988,7 @@
 'finfo_file' => ['string|false', 'finfo'=>'resource', 'file_name'=>'string', 'options='=>'int', 'context='=>'resource'],
 'finfo_open' => ['resource|false', 'options='=>'int', 'arg='=>'string'],
 'finfo_set_flags' => ['bool', 'finfo'=>'resource', 'options'=>'int'],
-'floatval' => ['float', 'var'=>'scalar'],
+'floatval' => ['float', 'var'=>'scalar|array|resource|null'],
 'flock' => ['bool', 'fp'=>'resource', 'operation'=>'int', '&w_wouldblock='=>'int'],
 'floor' => ['float|false', 'number'=>'float'],
 'flush' => ['void'],
@@ -5615,7 +5615,7 @@
 'intltz_to_date_time_zone' => ['DateTimeZone|false', 'obj'=>''],
 'intltz_use_daylight_time' => ['bool', 'obj'=>''],
 'intlz_create_default' => ['IntlTimeZone'],
-'intval' => ['int', 'var'=>'scalar', 'base='=>'int'],
+'intval' => ['int', 'var'=>'scalar|array|resource|null', 'base='=>'int'],
 'InvalidArgumentException::__clone' => ['void'],
 'InvalidArgumentException::__construct' => ['void', 'message='=>'string', 'code='=>'int', 'previous='=>'(?Throwable)|(?InvalidArgumentException)'],
 'InvalidArgumentException::__toString' => ['string'],
@@ -11807,7 +11807,7 @@
 'strtoupper' => ['string', 'str'=>'string'],
 'strtr' => ['string', 'str'=>'string', 'from'=>'string', 'to'=>'string'],
 'strtr\'1' => ['string', 'str'=>'string', 'replace_pairs'=>'array'],
-'strval' => ['string', 'var'=>'mixed'],
+'strval' => ['string', 'var'=>'scalar|resource|null'],
 'substr' => ['__benevolent<string|false>', 'string'=>'string', 'start'=>'int', 'length='=>'int'],
 'substr_compare' => ['int<-1, 1>|false', 'main_str'=>'string', 'str'=>'string', 'offset'=>'int', 'length='=>'int', 'case_sensitivity='=>'bool'],
 'substr_count' => ['0|positive-int', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'length='=>'int'],

tests/PHPStan/Analyser/data/strval.php

@@ -23,6 +23,9 @@ function strvalTest(string $string, string $class): void
 	assertType('class-string<stdClass>', strval($class));
 	assertType('string', strval(new \Exception()));
 	assertType('*ERROR*', strval(new \stdClass()));
+	assertType('*ERROR*', strval([]));
+	assertType('*ERROR*', strval(function() {}));
+	assertType('string', strval(fopen('php://memory', 'r')));
 }
 
 function intvalTest(string $string): void
@@ -41,6 +44,8 @@ function intvalTest(string $string): void
 	assertType('0', intval([]));
 	assertType('1', intval([null]));
 	assertType('int', intval(new \stdClass()));
+	assertType('int', intval(function() {}));
+	assertType('int', intval(fopen('php://memory', 'r')));
 }
 
 function floatvalTest(string $string): void
@@ -59,6 +64,8 @@ function floatvalTest(string $string): void
 	assertType('0.0', floatval([]));
 	assertType('1.0', floatval([null]));
 	assertType('float', floatval(new \stdClass()));
+	assertType('float', floatval(function() {}));
+	assertType('float', floatval(fopen('php://memory', 'r')));
 }
 
 function boolvalTest(string $string): void
@@ -77,6 +84,8 @@ function boolvalTest(string $string): void
 	assertType('false', boolval([]));
 	assertType('true', boolval([null]));
 	assertType('true', boolval(new \stdClass()));
+	assertType('true', boolval(function() {}));
+	assertType('bool', boolval(fopen('php://memory', 'r')));
 }
 
 function arrayTest(array $a): void