Merge branch '5.x' into upstream-master

vimeo · Aug 21, 2023 · a630c04 · a630c04
2 parents 98d1ca9 + d39a103
commit a630c04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -2942,7 +2942,7 @@
 'gc_enable' => ['void'],
 'gc_enabled' => ['bool'],
 'gc_mem_caches' => ['int'],
-'gc_status' => ['array{runs:int,collected:int,threshold:int,roots:int,running:bool,protected:bool,full:bool,buffer_size:int}'],
+'gc_status' => ['array{runs:int,collected:int,threshold:int,roots:int,running:bool,protected:bool,full:bool,buffer_size:int,application_time:float,collector_time:float,destructor_time:float,free_time:float}'],
 'gd_info' => ['array'],
 'gearman_bugreport' => [''],
 'gearman_client_add_options' => ['', 'client_object'=>'', 'option'=>''],

diff --git a/dictionaries/CallMap_83_delta.php b/dictionaries/CallMap_83_delta.php
@@ -23,7 +23,7 @@
   'changed' => [
     'gc_status' => [
       'old' => ['array{runs:int,collected:int,threshold:int,roots:int}'],
-      'new' => ['array{runs:int,collected:int,threshold:int,roots:int,running:bool,protected:bool,full:bool,buffer_size:int}'],
+      'new' => ['array{runs:int,collected:int,threshold:int,roots:int,running:bool,protected:bool,full:bool,buffer_size:int,application_time:float,collector_time:float,destructor_time:float,free_time:float}'],
     ],
     'srand' => [
       'old' => ['void', 'seed='=>'int', 'mode='=>'int'],