diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 20e23d909de..cfc2ddc5045 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -134,6 +134,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         count: ${{ fromJson(needs.chunk-matrix.outputs.count) }}
         chunk: ${{ fromJson(needs.chunk-matrix.outputs.chunks) }}
 
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index 441b640cc60..9c104f8d900 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -1351,7 +1351,7 @@
 'DateInterval::__construct' => ['void', 'duration'=>'string'],
 'DateInterval::__set_state' => ['DateInterval', 'array'=>'array'],
 'DateInterval::__wakeup' => ['void'],
-'DateInterval::createFromDateString' => ['DateInterval|false', 'datetime'=>'string'],
+'DateInterval::createFromDateString' => ['DateInterval', 'datetime'=>'string'],
 'DateInterval::format' => ['string', 'format'=>'string'],
 'DatePeriod::__construct' => ['void', 'start'=>'DateTimeInterface', 'interval'=>'DateInterval', 'recur'=>'int', 'options='=>'int'],
 'DatePeriod::__construct\'1' => ['void', 'start'=>'DateTimeInterface', 'interval'=>'DateInterval', 'end'=>'DateTimeInterface', 'options='=>'int'],
@@ -14647,7 +14647,7 @@
 'xml_parser_free' => ['bool', 'parser'=>'XMLParser'],
 'xml_parser_get_option' => ['string|int', 'parser'=>'XMLParser', 'option'=>'int'],
 'xml_parser_set_option' => ['bool', 'parser'=>'XMLParser', 'option'=>'int', 'value'=>'mixed'],
-'xml_set_character_data_handler' => ['true', 'parser'=>'XMLParser', 'handler'=>'callable'],
+'xml_set_character_data_handler' => ['true', 'parser'=>'XMLParser', 'handler'=>'callable|null'],
 'xml_set_default_handler' => ['true', 'parser'=>'XMLParser', 'handler'=>'callable'],
 'xml_set_element_handler' => ['true', 'parser'=>'XMLParser', 'start_handler'=>'callable', 'end_handler'=>'callable'],
 'xml_set_end_namespace_decl_handler' => ['true', 'parser'=>'XMLParser', 'handler'=>'callable'],
diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
index d30e107c906..1ad00312be1 100644
--- a/dictionaries/CallMap_80_delta.php
+++ b/dictionaries/CallMap_80_delta.php
@@ -2684,8 +2684,8 @@
       'new' => ['bool', 'parser'=>'XMLParser', 'option'=>'int', 'value'=>'mixed'],
     ],
     'xml_set_character_data_handler' => [
-      'old' => ['true', 'parser'=>'resource', 'handler'=>'callable'],
-      'new' => ['true', 'parser'=>'XMLParser', 'handler'=>'callable'],
+      'old' => ['true', 'parser'=>'resource', 'handler'=>'callable|null'],
+      'new' => ['true', 'parser'=>'XMLParser', 'handler'=>'callable|null'],
     ],
     'xml_set_default_handler' => [
       'old' => ['true', 'parser'=>'resource', 'handler'=>'callable'],
diff --git a/dictionaries/CallMap_84_delta.php b/dictionaries/CallMap_84_delta.php
index c5602022d62..fa8b68aabbc 100644
--- a/dictionaries/CallMap_84_delta.php
+++ b/dictionaries/CallMap_84_delta.php
@@ -20,10 +20,12 @@
   'removed' => [],
   'changed' => [
     'old' => [
-      'locale_set_default' => ['bool', 'locale'=>'string']
+      'locale_set_default' => ['bool', 'locale'=>'string'],
+      'DateInterval::createFromDateString' => ['DateInterval|false', 'datetime'=>'string'],
     ],
     'new' => [
-      'locale_set_default' => ['true', 'locale'=>'string']
+      'locale_set_default' => ['true', 'locale'=>'string'],
+      'DateInterval::createFromDateString' => ['DateInterval', 'datetime'=>'string'],
     ]
   ]
 ];
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index f4c6b07a326..4af2bb12ce9 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -15470,7 +15470,7 @@
     'xml_parser_free' => ['bool', 'parser'=>'resource'],
     'xml_parser_get_option' => ['string|int', 'parser'=>'resource', 'option'=>'int'],
     'xml_parser_set_option' => ['bool', 'parser'=>'resource', 'option'=>'int', 'value'=>'mixed'],
-    'xml_set_character_data_handler' => ['true', 'parser'=>'resource', 'handler'=>'callable'],
+    'xml_set_character_data_handler' => ['true', 'parser'=>'resource', 'handler'=>'callable|null'],
     'xml_set_default_handler' => ['true', 'parser'=>'resource', 'handler'=>'callable'],
     'xml_set_element_handler' => ['true', 'parser'=>'resource', 'start_handler'=>'callable', 'end_handler'=>'callable'],
     'xml_set_end_namespace_decl_handler' => ['true', 'parser'=>'resource', 'handler'=>'callable'],