Merge branch refs/heads/1.8.x into 1.9.x

Author: phpstan-bot

resources/functionMap.php

@@ -1060,7 +1060,7 @@
 'componere\cast_by_ref' => ['Type', 'arg1'=>'', 'object'=>''],
 'confirm_pdo_ibm_compiled' => [''],
 'connection_aborted' => ['0|1'],
-'connection_status' => ['int'],
+'connection_status' => ['int-mask<CONNECTION_NORMAL|CONNECTION_ABORTED|CONNECTION_TIMEOUT>'],
 'connection_timeout' => ['int'],
 'constant' => ['mixed', 'const_name'=>'string'],
 'convert_cyr_string' => ['string', 'str'=>'string', 'from'=>'string', 'to'=>'string'],
@@ -2998,7 +2998,7 @@
 'forward_static_call' => ['mixed', 'function'=>'callable', '...parameters='=>'mixed'],
 'forward_static_call_array' => ['mixed', 'function'=>'callable', 'parameters'=>'array<int,mixed>'],
 'fpassthru' => ['0|positive-int|false', 'fp'=>'resource'],
-'fpm_get_status' => ['array|false'],
+'fpm_get_status' => ['array{pool: string, process-manager: \'dynamic\'|\'ondemand\'|\'static\', start-time: int<0, max>, start-since: int<0, max>, accepted-conn: int<0, max>, listen-queue: int<0, max>, max-listen-queue: int<0, max>, listen-queue-len: int<0, max>, idle-processes: int<0, max>, active-processes: int<1, max>, total-processes: int<1, max>, max-active-processes: int<1, max>, max-children-reached: 0|1, slow-requests: int<0, max>, procs: array<int, array{pid: int<2, max>, state: \'Idle\'|\'Running\', start-time: int<0, max>, start-since: int<0, max>, requests: int<0, max>, request-duration: int<0, max>, request-method: string, request-uri: string, query-string: string, request-length: int<0, max>, user: string, script: string, last-request-cpu: float, last-request-memory: int<0, max>}>}|false'],
 'fprintf' => ['int', 'stream'=>'resource', 'format'=>'string', '...values='=>'string|int|float'],
 'fputcsv' => ['0|positive-int|false', 'fp'=>'resource', 'fields'=>'array', 'delimiter='=>'string', 'enclosure='=>'string', 'escape_char='=>'string'],
 'fputs' => ['0|positive-int|false', 'fp'=>'resource', 'str'=>'string', 'length='=>'0|positive-int'],

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1052,6 +1052,10 @@ public function dataFileAsserts(): iterable
 			yield from $this->gatherAssertTypes(__DIR__ . '/data/dnf.php');
 		}
 
+		if (PHP_VERSION_ID >= 70300) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/fpm-get-status.php');
+		}
+
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-offset-unset.php');
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-docblock.php');

tests/PHPStan/Analyser/data/fpm-get-status.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace FpmGetStatus;
+
+use function fpm_get_status;
+use function PHPStan\Testing\assertType;
+
+$status = fpm_get_status();
+
+assertType('array{pool: string, process-manager: \'dynamic\'|\'ondemand\'|\'static\', start-time: int<0, max>, start-since: int<0, max>, accepted-conn: int<0, max>, listen-queue: int<0, max>, max-listen-queue: int<0, max>, listen-queue-len: int<0, max>, idle-processes: int<0, max>, active-processes: int<1, max>, total-processes: int<1, max>, max-active-processes: int<1, max>, max-children-reached: 0|1, slow-requests: int<0, max>, procs: array<int, array{pid: int<2, max>, state: \'Idle\'|\'Running\', start-time: int<0, max>, start-since: int<0, max>, requests: int<0, max>, request-duration: int<0, max>, request-method: string, request-uri: string, query-string: string, request-length: int<0, max>, user: string, script: string, last-request-cpu: float, last-request-memory: int<0, max>}>}|false', $status);
+
+if ($status !== false && isset($status['procs'][0])) {
+	assertType('array{pid: int<2, max>, state: \'Idle\'|\'Running\', start-time: int<0, max>, start-since: int<0, max>, requests: int<0, max>, request-duration: int<0, max>, request-method: string, request-uri: string, query-string: string, request-length: int<0, max>, user: string, script: string, last-request-cpu: float, last-request-memory: int<0, max>}', $status['procs'][0]);
+
+	assertType('int<2, max>', $status['procs'][0]['pid']);
+}