diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index c816c535d16..d20efff9f0f 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -7909,7 +7909,7 @@
     'Thread::notifyOne' => ['bool'],
     'Thread::offsetExists' => ['bool', 'offset'=>'int|string'],
     'Thread::offsetGet' => ['mixed', 'offset'=>'int|string'],
-    'Thread::offsetSet' => ['void', 'offset'=>'int|string', 'value'=>'mixed'],
+    'Thread::offsetSet' => ['void', 'offset'=>'int|string|null', 'value'=>'mixed'],
     'Thread::offsetUnset' => ['void', 'offset'=>'int|string'],
     'Thread::pop' => ['bool'],
     'Thread::run' => ['void'],
@@ -7938,7 +7938,7 @@
     'Threaded::notifyOne' => ['bool'],
     'Threaded::offsetExists' => ['bool', 'offset'=>'int|string'],
     'Threaded::offsetGet' => ['mixed', 'offset'=>'int|string'],
-    'Threaded::offsetSet' => ['void', 'offset'=>'int|string', 'value'=>'mixed'],
+    'Threaded::offsetSet' => ['void', 'offset'=>'int|string|null', 'value'=>'mixed'],
     'Threaded::offsetUnset' => ['void', 'offset'=>'int|string'],
     'Threaded::pop' => ['bool'],
     'Threaded::run' => ['void'],
@@ -8246,7 +8246,7 @@
     'Worker::notifyOne' => ['bool'],
     'Worker::offsetExists' => ['bool', 'offset'=>'int|string'],
     'Worker::offsetGet' => ['mixed', 'offset'=>'int|string'],
-    'Worker::offsetSet' => ['void', 'offset'=>'int|string', 'value'=>'mixed'],
+    'Worker::offsetSet' => ['void', 'offset'=>'int|string|null', 'value'=>'mixed'],
     'Worker::offsetUnset' => ['void', 'offset'=>'int|string'],
     'Worker::pop' => ['bool'],
     'Worker::run' => ['void'],
@@ -8404,10 +8404,10 @@
     'Yaf\Config\Ini::get' => ['mixed', 'name='=>'mixed'],
     'Yaf\Config\Ini::key' => ['int|string'],
     'Yaf\Config\Ini::next' => ['void'],
-    'Yaf\Config\Ini::offsetExists' => ['bool', 'name'=>'mixed'],
-    'Yaf\Config\Ini::offsetGet' => ['mixed', 'name'=>'mixed'],
-    'Yaf\Config\Ini::offsetSet' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
-    'Yaf\Config\Ini::offsetUnset' => ['void', 'name'=>'mixed'],
+    'Yaf\Config\Ini::offsetExists' => ['bool', 'name'=>'int|string'],
+    'Yaf\Config\Ini::offsetGet' => ['mixed', 'name'=>'int|string'],
+    'Yaf\Config\Ini::offsetSet' => ['void', 'name'=>'int|string|null', 'value'=>'mixed'],
+    'Yaf\Config\Ini::offsetUnset' => ['void', 'name'=>'int|string'],
     'Yaf\Config\Ini::readonly' => ['bool'],
     'Yaf\Config\Ini::rewind' => ['void'],
     'Yaf\Config\Ini::set' => ['Yaf\Config_Abstract', 'name'=>'string', 'value'=>'mixed'],
@@ -8422,10 +8422,10 @@
     'Yaf\Config\Simple::get' => ['mixed', 'name='=>'mixed'],
     'Yaf\Config\Simple::key' => ['int|string'],
     'Yaf\Config\Simple::next' => ['void'],
-    'Yaf\Config\Simple::offsetExists' => ['bool', 'name'=>'mixed'],
-    'Yaf\Config\Simple::offsetGet' => ['mixed', 'name'=>'mixed'],
-    'Yaf\Config\Simple::offsetSet' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
-    'Yaf\Config\Simple::offsetUnset' => ['void', 'name'=>'mixed'],
+    'Yaf\Config\Simple::offsetExists' => ['bool', 'name'=>'int|string'],
+    'Yaf\Config\Simple::offsetGet' => ['mixed', 'name'=>'int|string'],
+    'Yaf\Config\Simple::offsetSet' => ['void', 'name'=>'int|string|null', 'value'=>'mixed'],
+    'Yaf\Config\Simple::offsetUnset' => ['void', 'name'=>'int|string'],
     'Yaf\Config\Simple::readonly' => ['bool'],
     'Yaf\Config\Simple::rewind' => ['void'],
     'Yaf\Config\Simple::set' => ['Yaf\Config_Abstract', 'name'=>'string', 'value'=>'mixed'],
@@ -8692,10 +8692,10 @@
     'Yaf\Session::has' => ['bool', 'name'=>'string'],
     'Yaf\Session::key' => ['int|string'],
     'Yaf\Session::next' => ['void'],
-    'Yaf\Session::offsetExists' => ['bool', 'name'=>'mixed'],
-    'Yaf\Session::offsetGet' => ['mixed', 'name'=>'mixed'],
-    'Yaf\Session::offsetSet' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
-    'Yaf\Session::offsetUnset' => ['void', 'name'=>'mixed'],
+    'Yaf\Session::offsetExists' => ['bool', 'name'=>'int|string'],
+    'Yaf\Session::offsetGet' => ['mixed', 'name'=>'int|string'],
+    'Yaf\Session::offsetSet' => ['void', 'name'=>'int|string|null', 'value'=>'mixed'],
+    'Yaf\Session::offsetUnset' => ['void', 'name'=>'int|string'],
     'Yaf\Session::rewind' => ['void'],
     'Yaf\Session::set' => ['Yaf\Session|false', 'name'=>'string', 'value'=>'mixed'],
     'Yaf\Session::start' => ['Yaf\Session'],
@@ -11343,10 +11343,10 @@
     'http\Message\Parser::stream' => ['int', 'stream'=>'resource', 'flags'=>'int', '&message'=>'http\Message'],
     'http\Params::__construct' => ['void', 'params='=>'mixed', 'param_sep='=>'mixed', 'arg_sep='=>'mixed', 'val_sep='=>'mixed', 'flags='=>'mixed'],
     'http\Params::__toString' => ['string'],
-    'http\Params::offsetExists' => ['bool', 'name'=>'mixed'],
-    'http\Params::offsetGet' => ['mixed', 'name'=>'mixed'],
-    'http\Params::offsetSet' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
-    'http\Params::offsetUnset' => ['void', 'name'=>'mixed'],
+    'http\Params::offsetExists' => ['bool', 'name'=>'int|string'],
+    'http\Params::offsetGet' => ['mixed', 'name'=>'int|string'],
+    'http\Params::offsetSet' => ['void', 'name'=>'int|string|null', 'value'=>'mixed'],
+    'http\Params::offsetUnset' => ['void', 'name'=>'int|string'],
     'http\Params::toArray' => ['array'],
     'http\Params::toString' => ['string'],
     'http\QueryString::__construct' => ['void', 'querystring'=>'string'],
@@ -11363,7 +11363,7 @@
     'http\QueryString::mod' => ['http\QueryString', 'params='=>'mixed'],
     'http\QueryString::offsetExists' => ['bool', 'offset'=>'int|string'],
     'http\QueryString::offsetGet' => ['mixed|null', 'offset'=>'int|string'],
-    'http\QueryString::offsetSet' => ['void', 'offset'=>'int|string', 'value'=>'mixed'],
+    'http\QueryString::offsetSet' => ['void', 'offset'=>'int|string|null', 'value'=>'mixed'],
     'http\QueryString::offsetUnset' => ['void', 'offset'=>'int|string'],
     'http\QueryString::serialize' => ['string'],
     'http\QueryString::set' => ['http\QueryString', 'params'=>'mixed'],