Fix type definition of curl "certinfo" array

Author: cs278

src/Type/Php/CurlGetinfoFunctionDynamicReturnTypeExtension.php

@@ -66,7 +66,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		$falseType = new ConstantBooleanType(false);
 		$stringFalseType = TypeCombinator::union($stringType, $falseType);
 		$integerStringArrayType = new ArrayType($integerType, $stringType);
-		$nestedIntegerStringArrayType = new ArrayType($integerType, $integerStringArrayType);
+		$nestedStringStringArrayType = new ArrayType($integerType, new ArrayType($stringType, $stringType));
 
 		$componentTypesPairedConstants = [
 			'CURLINFO_EFFECTIVE_URL' => $stringType,
@@ -105,7 +105,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			'CURLINFO_COOKIELIST' => $integerStringArrayType,
 			'CURLINFO_FTP_ENTRY_PATH' => $stringFalseType,
 			'CURLINFO_APPCONNECT_TIME' => $floatType,
-			'CURLINFO_CERTINFO' => $nestedIntegerStringArrayType,
+			'CURLINFO_CERTINFO' => $nestedStringStringArrayType,
 			'CURLINFO_CONDITION_UNMET' => $integerType,
 			'CURLINFO_RTSP_CLIENT_CSEQ' => $integerType,
 			'CURLINFO_RTSP_CSEQ_RECV' => $integerType,
@@ -158,7 +158,7 @@ private function createAllComponentsReturnType(): Type
 		$integerType = new IntegerType();
 		$floatType = new FloatType();
 		$stringOrNullType = TypeCombinator::union($stringType, new NullType());
-		$integerStringArrayType = new ArrayType($integerType, $stringType);
+		$nestedStringStringArrayType = new ArrayType($integerType, new ArrayType($stringType, $stringType));
 
 		$componentTypesPairedStrings = [
 			'url' => $stringType,
@@ -183,7 +183,7 @@ private function createAllComponentsReturnType(): Type
 			'redirect_time' => $floatType,
 			'redirect_url' => $stringType,
 			'primary_ip' => $stringType,
-			'certinfo' => $integerStringArrayType,
+			'certinfo' => $nestedStringStringArrayType,
 			'primary_port' => $integerType,
 			'local_ip' => $stringType,
 			'local_port' => $integerType,

tests/PHPStan/Analyser/data/curl_getinfo.php

@@ -14,10 +14,10 @@ public function bar()
 		assertType('mixed', CURL_GETINFO());
 		assertType('mixed', CuRl_GeTiNfO());
 		assertType('false', curl_getinfo($handle, 'Invalid Argument'));
-		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, string>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle, PHP_INT_MAX));
-		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, string>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle, PHP_EOL));
-		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, string>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle));
-		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, string>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle, null));
+		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, array<string, string>>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle, PHP_INT_MAX));
+		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, array<string, string>>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle, PHP_EOL));
+		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, array<string, string>>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle));
+		assertType('(array{url: string, content_type: string|null, http_code: int, header_size: int, request_size: int, filetime: int, ssl_verify_result: int, redirect_count: int, total_time: float, namelookup_time: float, connect_time: float, pretransfer_time: float, size_upload: float, size_download: float, speed_download: float, speed_upload: float, download_content_length: float, upload_content_length: float, starttransfer_time: float, redirect_time: float, redirect_url: string, primary_ip: string, certinfo: array<int, array<string, string>>, primary_port: int, local_ip: string, local_port: int, http_version: int, protocol: int, ssl_verifyresult: int, scheme: string}|false)', curl_getinfo($handle, null));
 		assertType('string', curl_getinfo($handle, CURLINFO_EFFECTIVE_URL));
 		assertType('string', curl_getinfo($handle, 1048577)); // CURLINFO_EFFECTIVE_URL int value without using constant
 		assertType('false', curl_getinfo($handle, 12345678)); // Non constant non CURLINFO_* int value
@@ -56,7 +56,7 @@ public function bar()
 		assertType('array<int, string>', curl_getinfo($handle, CURLINFO_COOKIELIST));
 		assertType('string|false', curl_getinfo($handle, CURLINFO_FTP_ENTRY_PATH));
 		assertType('float', curl_getinfo($handle, CURLINFO_APPCONNECT_TIME));
-		assertType('array<int, array<int, string>>', curl_getinfo($handle, CURLINFO_CERTINFO));
+		assertType('array<int, array<string, string>>', curl_getinfo($handle, CURLINFO_CERTINFO));
 		assertType('int', curl_getinfo($handle, CURLINFO_CONDITION_UNMET));
 		assertType('int', curl_getinfo($handle, CURLINFO_RTSP_CLIENT_CSEQ));
 		assertType('int', curl_getinfo($handle, CURLINFO_RTSP_CSEQ_RECV));