fix crash in <PHP8 with ResourceBundle

partially reverts vimeo#8217
kkmuffme · Sep 21, 2022 · 3c41713 · 3c41713
1 parent 5bf59e4
commit 3c41713
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -214,7 +214,7 @@
       'new' => ['bool', 'typelib_name'=>'string', 'case_insensitive='=>'true'],
     ],
     'count' => [
-        'old' => ['int', 'value'=>'Countable|array|SimpleXMLElement|ResourceBundle', 'mode='=>'int'],
+        'old' => ['int', 'value'=>'Countable|array|SimpleXMLElement', 'mode='=>'int'],
         'new' => ['int', 'value'=>'Countable|array', 'mode='=>'int'],
     ],
     'count_chars' => [

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -10085,7 +10085,7 @@
     'copy' => ['bool', 'from'=>'string', 'to'=>'string', 'context='=>'resource'],
     'cos' => ['float', 'num'=>'float'],
     'cosh' => ['float', 'num'=>'float'],
-    'count' => ['int', 'value'=>'Countable|array|SimpleXMLElement|ResourceBundle', 'mode='=>'int'],
+    'count' => ['int', 'value'=>'Countable|array|SimpleXMLElement', 'mode='=>'int'],
     'count_chars' => ['array<int,int>|false', 'input'=>'string', 'mode='=>'0|1|2'],
     'count_chars\'1' => ['string|false', 'input'=>'string', 'mode='=>'3|4'],
     'crack_check' => ['bool', 'dictionary'=>'', 'password'=>'string'],

diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -51,6 +51,7 @@ class InternalCallMapHandlerTest extends TestCase
     private static $ignoredFunctions = [
         'apcu_entry',
         'array_multisort',
+        'count', // #8346
         'bcdiv',
         'bcmod',
         'bcpowmod',