Merge pull request #8367 from kkmuffme/revert-nullable-curl_multi_get…

…content partial revert nullable type for curl_multi_getcontent
vimeo · Sep 8, 2022 · eba63a3 · eba63a3
2 parents f84e7af + 6e4c182
commit eba63a3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -278,8 +278,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
@@ -10219,7 +10219,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
@@ -342,6 +342,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',