From 6e4c1823d6da316614fa17e45264f6aa13886925 Mon Sep 17 00:00:00 2001
From: kkmuffme <11071985+kkmuffme@users.noreply.github.com>
Date: Thu, 4 Aug 2022 00:45:33 +0200
Subject: [PATCH] partial revert nullable type for curl_multi_getcontent

Fix https://github.com/vimeo/psalm/issues/8351

Partially reverts https://github.com/vimeo/psalm/commit/f28ac7377778e281c1b406251dd839f88ea4622e
---
 dictionaries/CallMap.php                               | 2 +-
 dictionaries/CallMap_80_delta.php                      | 4 ++--
 dictionaries/CallMap_historical.php                    | 2 +-
 tests/Internal/Codebase/InternalCallMapHandlerTest.php | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index 219e6372641..8c9eeb8a338 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -1678,7 +1678,7 @@
 'curl_multi_close' => ['void', 'multi_handle'=>'CurlMultiHandle'],
 'curl_multi_errno' => ['int', 'multi_handle'=>'CurlMultiHandle'],
 'curl_multi_exec' => ['int', 'multi_handle'=>'CurlMultiHandle', '&w_still_running'=>'int'],
-'curl_multi_getcontent' => ['?string', 'handle'=>'CurlHandle'],
+'curl_multi_getcontent' => ['string', 'handle'=>'CurlHandle'],
 'curl_multi_info_read' => ['array|false', 'multi_handle'=>'CurlMultiHandle', '&w_queued_messages='=>'int'],
 'curl_multi_init' => ['CurlMultiHandle|false'],
 'curl_multi_remove_handle' => ['int', 'multi_handle'=>'CurlMultiHandle', 'handle'=>'CurlHandle'],
diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
index afeb1bc4133..21f4f6665a0 100644
--- a/dictionaries/CallMap_80_delta.php
+++ b/dictionaries/CallMap_80_delta.php
@@ -282,8 +282,8 @@
       'new' => ['int', 'multi_handle'=>'CurlMultiHandle', '&w_still_running'=>'int'],
     ],
     'curl_multi_getcontent' => [
-      'old' => ['?string', 'ch'=>'resource'],
-      'new' => ['?string', 'handle'=>'CurlHandle'],
+      'old' => ['string', 'ch'=>'resource'],
+      'new' => ['string', 'handle'=>'CurlHandle'],
     ],
     'curl_multi_info_read' => [
       'old' => ['array|false', 'mh'=>'resource', '&w_msgs_in_queue='=>'int'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index a5c4875aa71..43652148102 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -10135,7 +10135,7 @@
     'curl_multi_add_handle' => ['int', 'mh'=>'resource', 'ch'=>'resource'],
     'curl_multi_close' => ['void', 'mh'=>'resource'],
     'curl_multi_exec' => ['int', 'mh'=>'resource', '&w_still_running'=>'int'],
-    'curl_multi_getcontent' => ['?string', 'ch'=>'resource'],
+    'curl_multi_getcontent' => ['string', 'ch'=>'resource'],
     'curl_multi_info_read' => ['array|false', 'mh'=>'resource', '&w_msgs_in_queue='=>'int'],
     'curl_multi_init' => ['resource|false'],
     'curl_multi_remove_handle' => ['int', 'mh'=>'resource', 'ch'=>'resource'],
diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
index 164fb4143d1..7ac15128d7b 100644
--- a/tests/Internal/Codebase/InternalCallMapHandlerTest.php
+++ b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -343,6 +343,7 @@ class InternalCallMapHandlerTest extends TestCase
         'cal_from_jd',
         'collator_get_strength',
         'curl_multi_init',
+        'curl_multi_getcontent', // issue #8351
         'date_add',
         'date_date_set',
         'date_diff',