diff --git a/src/Reflection/ParametersAcceptorSelector.php b/src/Reflection/ParametersAcceptorSelector.php
index fd2f2b8ae1..82af7d4267 100644
--- a/src/Reflection/ParametersAcceptorSelector.php
+++ b/src/Reflection/ParametersAcceptorSelector.php
@@ -918,49 +918,91 @@ private static function getCurlOptValueType(int $curlOpt): ?Type
 			}
 		}
 
+		$nullableStringConstants = [
+			'CURLOPT_ACCEPT_ENCODING',
+			'CURLOPT_CUSTOMREQUEST',
+			'CURLOPT_DNS_INTERFACE',
+			'CURLOPT_DNS_LOCAL_IP4',
+			'CURLOPT_DNS_LOCAL_IP6',
+			'CURLOPT_DOH_URL',
+			'CURLOPT_FTP_ACCOUNT',
+			'CURLOPT_FTPPORT',
+			'CURLOPT_HSTS',
+			'CURLOPT_KRBLEVEL',
+			'CURLOPT_RANGE',
+			'CURLOPT_RTSP_SESSION_ID',
+			'CURLOPT_UNIX_SOCKET_PATH',
+			'CURLOPT_XOAUTH2_BEARER',
+		];
+		foreach ($nullableStringConstants as $constName) {
+			if (defined($constName) && constant($constName) === $curlOpt) {
+				return new UnionType([
+					new NullType(),
+					TypeCombinator::intersect(
+						new StringType(),
+						new AccessoryNonEmptyStringType(),
+					),
+				]);
+			}
+		}
+
 		$nonEmptyStringConstants = [
 			'CURLOPT_ABSTRACT_UNIX_SOCKET',
+			'CURLOPT_ALTSVC',
+			'CURLOPT_AWS_SIGV4',
 			'CURLOPT_CAINFO',
 			'CURLOPT_CAPATH',
 			'CURLOPT_COOKIE',
 			'CURLOPT_COOKIEJAR',
 			'CURLOPT_COOKIELIST',
-			'CURLOPT_CUSTOMREQUEST',
 			'CURLOPT_DEFAULT_PROTOCOL',
-			'CURLOPT_DNS_INTERFACE',
-			'CURLOPT_DNS_LOCAL_IP4',
-			'CURLOPT_DNS_LOCAL_IP6',
+			'CURLOPT_DNS_SERVERS',
 			'CURLOPT_EGDSOCKET',
-			'CURLOPT_FTPPORT',
+			'CURLOPT_FTP_ALTERNATIVE_TO_USER',
 			'CURLOPT_INTERFACE',
 			'CURLOPT_KEYPASSWD',
 			'CURLOPT_KRB4LEVEL',
 			'CURLOPT_LOGIN_OPTIONS',
+			'CURLOPT_MAIL_AUTH',
+			'CURLOPT_MAIL_FROM',
+			'CURLOPT_NOPROXY',
+			'CURLOPT_PASSWORD',
 			'CURLOPT_PINNEDPUBLICKEY',
-			'CURLOPT_PROXY_SERVICE_NAME',
+			'CURLOPT_PROTOCOLS_STR',
 			'CURLOPT_PROXY_CAINFO',
 			'CURLOPT_PROXY_CAPATH',
 			'CURLOPT_PROXY_CRLFILE',
+			'CURLOPT_PROXY_ISSUERCERT',
 			'CURLOPT_PROXY_KEYPASSWD',
 			'CURLOPT_PROXY_PINNEDPUBLICKEY',
+			'CURLOPT_PROXY_SERVICE_NAME',
+			'CURLOPT_PROXY_SSL_CIPHER_LIST',
 			'CURLOPT_PROXY_SSLCERT',
 			'CURLOPT_PROXY_SSLCERTTYPE',
-			'CURLOPT_PROXY_SSL_CIPHER_LIST',
-			'CURLOPT_PROXY_TLS13_CIPHERS',
 			'CURLOPT_PROXY_SSLKEY',
 			'CURLOPT_PROXY_SSLKEYTYPE',
+			'CURLOPT_PROXY_TLS13_CIPHERS',
 			'CURLOPT_PROXY_TLSAUTH_PASSWORD',
 			'CURLOPT_PROXY_TLSAUTH_TYPE',
 			'CURLOPT_PROXY_TLSAUTH_USERNAME',
+			'CURLOPT_PROXYPASSWORD',
+			'CURLOPT_PROXYUSERNAME',
 			'CURLOPT_PROXYUSERPWD',
 			'CURLOPT_RANDOM_FILE',
-			'CURLOPT_RANGE',
+			'CURLOPT_REDIR_PROTOCOLS_STR',
 			'CURLOPT_REFERER',
+			'CURLOPT_REQUEST_TARGET',
+			'CURLOPT_RTSP_STREAM_URI',
+			'CURLOPT_RTSP_TRANSPORT',
+			'CURLOPT_SASL_AUTHZID',
 			'CURLOPT_SERVICE_NAME',
+			'CURLOPT_SOCKS5_GSSAPI_SERVICE',
 			'CURLOPT_SSH_HOST_PUBLIC_KEY_MD5',
-			'CURLOPT_SSH_PUBLIC_KEYFILE',
+			'CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256',
 			'CURLOPT_SSH_PRIVATE_KEYFILE',
+			'CURLOPT_SSH_PUBLIC_KEYFILE',
 			'CURLOPT_SSL_CIPHER_LIST',
+			'CURLOPT_SSL_EC_CURVES',
 			'CURLOPT_SSLCERT',
 			'CURLOPT_SSLCERTPASSWD',
 			'CURLOPT_SSLCERTTYPE',
@@ -970,13 +1012,14 @@ private static function getCurlOptValueType(int $curlOpt): ?Type
 			'CURLOPT_SSLKEYPASSWD',
 			'CURLOPT_SSLKEYTYPE',
 			'CURLOPT_TLS13_CIPHERS',
-			'CURLOPT_UNIX_SOCKET_PATH',
+			'CURLOPT_TLSAUTH_PASSWORD',
+			'CURLOPT_TLSAUTH_TYPE',
+			'CURLOPT_TLSAUTH_USERNAME',
+			'CURLOPT_TRANSFER_ENCODING',
 			'CURLOPT_URL',
 			'CURLOPT_USERAGENT',
 			'CURLOPT_USERNAME',
-			'CURLOPT_PASSWORD',
 			'CURLOPT_USERPWD',
-			'CURLOPT_XOAUTH2_BEARER',
 		];
 		foreach ($nonEmptyStringConstants as $constName) {
 			if (defined($constName) && constant($constName) === $curlOpt) {
diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
index 8a213fb622..614dbd4143 100644
--- a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
+++ b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -1314,33 +1314,45 @@ public function testCurlSetOpt(): void
 				'Parameter #3 $value of function curl_setopt expects array<int, string>, int given.',
 				17,
 			],
+			[
+				'Parameter #3 $value of function curl_setopt expects non-empty-string, null given.',
+				18,
+			],
 			[
 				'Parameter #3 $value of function curl_setopt expects bool, int given.',
-				19,
+				20,
 			],
 			[
 				'Parameter #3 $value of function curl_setopt expects bool, string given.',
-				20,
+				21,
 			],
 			[
 				'Parameter #3 $value of function curl_setopt expects int, string given.',
-				22,
+				23,
 			],
 			[
 				'Parameter #3 $value of function curl_setopt expects array, string given.',
-				24,
+				25,
 			],
 			[
 				'Parameter #3 $value of function curl_setopt expects resource, string given.',
-				26,
+				27,
 			],
 			[
 				'Parameter #3 $value of function curl_setopt expects array|string, int given.',
-				28,
+				29,
+			],
+			[
+				'Parameter #3 $value of function curl_setopt expects non-empty-string, \'\' given.',
+				31,
+			],
+			[
+				'Parameter #3 $value of function curl_setopt expects non-empty-string|null, \'\' given.',
+				32,
 			],
 			[
 				'Parameter #3 $value of function curl_setopt expects array<int, string>, array<string, string> given.',
-				67,
+				73,
 			],
 		]);
 	}
diff --git a/tests/PHPStan/Rules/Functions/data/curl_setopt.php b/tests/PHPStan/Rules/Functions/data/curl_setopt.php
index 76d3136a2d..24987ddbc9 100644
--- a/tests/PHPStan/Rules/Functions/data/curl_setopt.php
+++ b/tests/PHPStan/Rules/Functions/data/curl_setopt.php
@@ -15,6 +15,7 @@ public function errors(int $i, string $s) {
 		// expecting string
 		curl_setopt($curl, CURLOPT_URL, $i);
 		curl_setopt($curl, CURLOPT_HTTPHEADER, $i);
+		curl_setopt($curl, CURLOPT_ABSTRACT_UNIX_SOCKET, null);
 		// expecting bool
 		curl_setopt($curl, CURLOPT_AUTOREFERER, $i);
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, $s);
@@ -26,6 +27,9 @@ public function errors(int $i, string $s) {
 		curl_setopt($curl, CURLOPT_FILE, $s);
 		// expecting string or array
 		curl_setopt($curl, CURLOPT_POSTFIELDS, $i);
+		// expecting non empty string
+		curl_setopt($curl, CURLOPT_URL, '');
+		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, '');
 	}
 
 	/**
@@ -41,6 +45,8 @@ public function allGood(string $url, array $header) {
 		curl_setopt($curl, CURLOPT_AUTOREFERER, true);
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($curl, CURLOPT_TIMEOUT, 10);
+		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'POST');
+		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, null);
 
 		$fp = fopen("example_homepage.txt", "w");
 		if ($fp === false) {