diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index 51731b25a65..58661c35956 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -1029,7 +1029,7 @@
 'chmod' => ['bool', 'filename'=>'string', 'permissions'=>'int'],
 'chop' => ['string', 'string'=>'string', 'characters='=>'string'],
 'chown' => ['bool', 'filename'=>'string', 'user'=>'string|int'],
-'chr' => ['string', 'codepoint'=>'int'],
+'chr' => ['non-empty-string', 'codepoint'=>'int'],
 'chroot' => ['bool', 'directory'=>'string'],
 'chunk_split' => ['string', 'string'=>'string', 'length='=>'int', 'separator='=>'string'],
 'class_alias' => ['bool', 'class'=>'string', 'alias'=>'string', 'autoload='=>'bool'],
@@ -7227,7 +7227,7 @@
 'maxdb_use_result' => ['resource', 'link'=>''],
 'maxdb_warning_count' => ['int', 'link'=>'resource'],
 'mb_check_encoding' => ['bool', 'value='=>'array|string|null', 'encoding='=>'string|null'],
-'mb_chr' => ['string|false', 'codepoint'=>'int', 'encoding='=>'string|null'],
+'mb_chr' => ['non-empty-string|false', 'codepoint'=>'int', 'encoding='=>'string|null'],
 'mb_convert_case' => ['string', 'string'=>'string', 'mode'=>'int', 'encoding='=>'string|null'],
 'mb_convert_encoding' => ['string|false', 'string'=>'string', 'to_encoding'=>'string', 'from_encoding='=>'array|string|null'],
 'mb_convert_encoding\'1' => ['array', 'string'=>'array', 'to_encoding'=>'string', 'from_encoding='=>'array|string|null'],
diff --git a/dictionaries/CallMap_72_delta.php b/dictionaries/CallMap_72_delta.php
index 4fdd3f0a25c..c283ed8ce94 100644
--- a/dictionaries/CallMap_72_delta.php
+++ b/dictionaries/CallMap_72_delta.php
@@ -33,7 +33,7 @@
     'ldap_exop_refresh' => ['int|false', 'ldap'=>'resource', 'dn'=>'string', 'ttl'=>'int'],
     'ldap_exop_whoami' => ['string|false', 'ldap'=>'resource'],
     'ldap_parse_exop' => ['bool', 'ldap'=>'resource', 'result'=>'resource', '&w_response_data='=>'string', '&w_response_oid='=>'string'],
-    'mb_chr' => ['string|false', 'codepoint'=>'int', 'encoding='=>'string'],
+    'mb_chr' => ['non-empty-string|false', 'codepoint'=>'int', 'encoding='=>'string'],
     'mb_convert_encoding\'1' => ['array', 'string'=>'array', 'to_encoding'=>'string', 'from_encoding='=>'mixed'],
     'mb_ord' => ['int|false', 'string'=>'string', 'encoding='=>'string'],
     'mb_scrub' => ['string', 'string'=>'string', 'encoding='=>'string'],
diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
index b7cd36590f3..227f936917f 100644
--- a/dictionaries/CallMap_80_delta.php
+++ b/dictionaries/CallMap_80_delta.php
@@ -934,8 +934,8 @@
       'new' => ['bool', 'value='=>'array|string|null', 'encoding='=>'string|null'],
     ],
     'mb_chr' => [
-      'old' => ['string|false', 'codepoint'=>'int', 'encoding='=>'string'],
-      'new' => ['string|false', 'codepoint'=>'int', 'encoding='=>'string|null'],
+      'old' => ['non-empty-string|false', 'codepoint'=>'int', 'encoding='=>'string'],
+      'new' => ['non-empty-string|false', 'codepoint'=>'int', 'encoding='=>'string|null'],
     ],
     'mb_convert_case' => [
       'old' => ['string', 'string'=>'string', 'mode'=>'int', 'encoding='=>'string'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index f8410e81dfc..4ce8f22cd7a 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -9930,7 +9930,7 @@
     'chmod' => ['bool', 'filename'=>'string', 'permissions'=>'int'],
     'chop' => ['string', 'string'=>'string', 'characters='=>'string'],
     'chown' => ['bool', 'filename'=>'string', 'user'=>'string|int'],
-    'chr' => ['string', 'codepoint'=>'int'],
+    'chr' => ['non-empty-string', 'codepoint'=>'int'],
     'chroot' => ['bool', 'directory'=>'string'],
     'chunk_split' => ['string', 'string'=>'string', 'length='=>'int', 'separator='=>'string'],
     'classObj::__construct' => ['void', 'layer'=>'layerObj', 'class'=>'classObj'],