Fix a couple CURLOPT_* parameter types

jlherren · ondrejmirtes · commit 90403cc656ac · 2022-10-16T11:59:26.000+02:00
Fixes phpstan/phpstan#8152 Fixes phpstan/phpstan#8157
diff --git a/src/Reflection/ParametersAcceptorSelector.php b/src/Reflection/ParametersAcceptorSelector.php
@@ -631,7 +631,6 @@ private static function getCurlOptValueType(int $curlOpt): ?Type
 			'CURLOPT_CAINFO',
 			'CURLOPT_CAPATH',
 			'CURLOPT_COOKIE',
-			'CURLOPT_COOKIEFILE',
 			'CURLOPT_COOKIEJAR',
 			'CURLOPT_COOKIELIST',
 			'CURLOPT_CUSTOMREQUEST',
@@ -646,9 +645,6 @@ private static function getCurlOptValueType(int $curlOpt): ?Type
 			'CURLOPT_KRB4LEVEL',
 			'CURLOPT_LOGIN_OPTIONS',
 			'CURLOPT_PINNEDPUBLICKEY',
-			'CURLOPT_PRIVATE',
-			'CURLOPT_PRE_PROXY',
-			'CURLOPT_PROXY',
 			'CURLOPT_PROXY_SERVICE_NAME',
 			'CURLOPT_PROXY_CAINFO',
 			'CURLOPT_PROXY_CAPATH',
@@ -700,7 +696,11 @@ private static function getCurlOptValueType(int $curlOpt): ?Type
 		}
 
 		$stringConstants = [
+			'CURLOPT_COOKIEFILE',
 			'CURLOPT_ENCODING',
+			'CURLOPT_PRE_PROXY',
+			'CURLOPT_PRIVATE',
+			'CURLOPT_PROXY',
 		];
 		foreach ($stringConstants as $constName) {
 			if (defined($constName) && constant($constName) === $curlOpt) {
diff --git a/tests/PHPStan/Rules/Functions/data/curl_setopt.php b/tests/PHPStan/Rules/Functions/data/curl_setopt.php
@@ -50,5 +50,9 @@ public function allGood(string $url, array $header) {
 		curl_setopt($curl, CURLOPT_POSTFIELDS, array('foo' => 'bar'));
 		curl_setopt($curl, CURLOPT_POSTFIELDS, '');
 		curl_setopt($curl, CURLOPT_POSTFIELDS, 'para1=val1&para2=val2');
+		curl_setopt($curl, CURLOPT_COOKIEFILE, '');
+		curl_setopt($curl, CURLOPT_PRE_PROXY, '');
+		curl_setopt($curl, CURLOPT_PROXY, '');
+		curl_setopt($curl, CURLOPT_PRIVATE, '');
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,9 @@ public function allGood(string $url, array $header) {`
`50`	`50`	`curl_setopt($curl, CURLOPT_POSTFIELDS, array('foo' => 'bar'));`
`51`	`51`	`curl_setopt($curl, CURLOPT_POSTFIELDS, '');`
`52`	`52`	`curl_setopt($curl, CURLOPT_POSTFIELDS, 'para1=val1&para2=val2');`
	`53`	`+ curl_setopt($curl, CURLOPT_COOKIEFILE, '');`
	`54`	`+ curl_setopt($curl, CURLOPT_PRE_PROXY, '');`
	`55`	`+ curl_setopt($curl, CURLOPT_PROXY, '');`
	`56`	`+ curl_setopt($curl, CURLOPT_PRIVATE, '');`
`53`	`57`	`}`
`54`	`58`	`}`