More precise getimagesize* return type

Author: staabm

resources/functionMap.php

@@ -3330,8 +3330,8 @@
 'gethostbyname' => ['string', 'hostname'=>'string'],
 'gethostbynamel' => ['list<string>|false', 'hostname'=>'string'],
 'gethostname' => ['string|false'],
-'getimagesize' => ['array|false', 'imagefile'=>'string', '&w_info='=>'array'],
-'getimagesizefromstring' => ['array|false', 'data'=>'string', '&w_info='=>'array'],
+'getimagesize' => ['array{0:int, 1: int, 2: int, 3: string, mime: string, channels?: int, bits?: int}|false', 'imagefile'=>'string', '&w_info='=>'array'],
+'getimagesizefromstring' => ['array{0:int, 1: 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/NodeScopeResolverTest.php

@@ -1253,6 +1253,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/ini-get.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9274.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/extract.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/image-size.php');
 	}
 
 	/**

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace ImageSize;
+
+
+use function PHPStan\Testing\assertType;
+
+function imageFoo(): void
+{
+	$imagesize = getimagesize("img/flag.jpg");
+	if ($imagesize === false) {
+		return;
+	}
+
+	list($width, $height, $type, $attr) = $imagesize;
+
+	assertType('int', $width);
+	assertType('int', $height);
+	assertType('int', $type);
+	assertType('string', $attr);
+	assertType('string', $imagesize['mime']);
+	assertType('int', $imagesize['channels']);
+	assertType('int', $imagesize['bits']);
+}
+
+function imagesizeFoo(string $s): void
+{
+	$imagesize = getimagesizefromstring($s);
+	if ($imagesize === false) {
+		return;
+	}
+	list($width, $height, $type, $attr) = $imagesize;
+
+	assertType('int', $width);
+	assertType('int', $height);
+	assertType('int', $type);
+	assertType('string', $attr);
+	assertType('string', $imagesize['mime']);
+	assertType('int', $imagesize['channels']);
+	assertType('int', $imagesize['bits']);
+}
+
+