getimagesize, getimagesizefromstring zero is a possible value for height and width

Author: Markus Fruehauf

resources/functionMap.php

@@ -3331,8 +3331,8 @@
 'gethostbyname' => ['string', 'hostname'=>'string'],
 'gethostbynamel' => ['list<string>|false', 'hostname'=>'string'],
 'gethostname' => ['string|false'],
-'getimagesize' => ['array{0: positive-int, 1: positive-int, 2: int, 3: string, mime: string, channels?: int, bits?: int}|false', 'imagefile'=>'string', '&w_info='=>'array'],
-'getimagesizefromstring' => ['array{0: positive-int, 1: positive-int, 2: int, 3: string, mime: string, channels?: int, bits?: int}|false', 'data'=>'string', '&w_info='=>'array'],
+'getimagesize' => ['array{0: 0|positive-int, 1: 0|positive-int, 2: int, 3: string, mime: string, channels?: int, bits?: int}|false', 'imagefile'=>'string', '&w_info='=>'array'],
+'getimagesizefromstring' => ['array{0: 0|positive-int, 1: 0|positive-int, 2: int, 3: string, mime: string, channels?: int, bits?: int}|false', 'data'=>'string', '&w_info='=>'array'],
 'getlastmod' => ['int|false'],
 'getmxrr' => ['bool', 'hostname'=>'string', '&w_mxhosts'=>'array', '&w_weight='=>'array'],
 'getmygid' => ['int|false'],

tests/PHPStan/Analyser/nsrt/image-size.php

@@ -14,8 +14,8 @@ function imageFoo(): void
 
 	list($width, $height, $type, $attr) = $imagesize;
 
-	assertType('int<1, max>', $width);
-	assertType('int<1, max>', $height);
+	assertType('int<0, max>', $width);
+	assertType('int<0, max>', $height);
 	assertType('int', $type);
 	assertType('string', $attr);
 	assertType('string', $imagesize['mime']);
@@ -31,8 +31,8 @@ function imagesizeFoo(string $s): void
 	}
 	list($width, $height, $type, $attr) = $imagesize;
 
-	assertType('int<1, max>', $width);
-	assertType('int<1, max>', $height);
+	assertType('int<0, max>', $width);
+	assertType('int<0, max>', $height);
 	assertType('int', $type);
 	assertType('string', $attr);
 	assertType('string', $imagesize['mime']);