diff --git a/NEWS b/NEWS
index 380c7aba24c09..d8ebe4a92ddeb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,28 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.0beta1
 
+- Core:
+  . Non-canonical cast names (boolean), (integer), (double), and (binary) have
+    been deprecated. (Girgias)
+
+- FileInfo
+  . The finfo_close() function has been deprecated. (timwolla)
+
+- MySQLi:
+  . The mysqli_execute() alias function has been deprecated. (timwolla)
+
+- PDO:
+  . The "uri:" DSN scheme has been deprecated due to security concerns with
+    DSNs coming from remote URIs. (timwolla)
+
 - Reflection:
   . Fixed bug GH-17927 (Reflection: have some indication of property hooks in
     `_property_string()`). (DanielEScherzer)
+  . The setAccessible() methods of various Reflection objects have been
+    deprecated, as those no longer have an effect. (timwolla)
+
+- Standard:
+  . The socket_set_timeout() alias function has been deprecated. (timwolla)
 
 31 Jul 2025, PHP 8.5.0alpha4
 
diff --git a/UPGRADING b/UPGRADING
index f3a7494d3c839..cfc010cee233b 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -316,12 +316,41 @@ PHP 8.5 UPGRADE NOTES
     one will still be used. If a user output handler returns a non-string and
     produces output, the warning about producing an output is emitted first.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_4
+  . Non-canonical cast names (boolean), (integer), (double), and (binary) have
+    been deprecated, use (bool), (int), (float), and (string) respectively.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_non-standard_cast_names
+
+- FileInfo:
+  . The finfo_close() function has been deprecated.
+    As finfo objects are freed automatically.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_finfo_close
 
 - Hash:
   . The MHASH_* constants have been deprecated.  These have been overlooked
     when the mhash*() function family has been deprecated per
     https://wiki.php.net/rfc/deprecations_php_8_1#mhash_function_family
 
+- MySQLi:
+  . The mysqli_execute() alias function has been deprecated.
+    Use mysqli_stmt_execute() instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#formally_deprecate_mysqli_execute
+
+- PDO:
+  . The "uri:" DSN scheme has been deprecated due to security concerns with
+    DSNs coming from remote URIs.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_pdo_s_urischeme
+
+
+- Reflection:
+  . The setAccessible() methods of various Reflection objects have been
+    deprecated, as those no longer have an effect.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_reflectionsetaccessible
+
+- Standard:
+  . The socket_set_timeout() alias function has been deprecated.
+    Use stream_set_timeout() instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#formally_deprecate_socket_set_timeout
+
 ========================================
 5. Changed Functions
 ========================================
diff --git a/Zend/tests/type_casts/cast_to_double.phpt b/Zend/tests/type_casts/cast_to_double.phpt
index 2972fbbe8027a..69a625b09de88 100644
--- a/Zend/tests/type_casts/cast_to_double.phpt
+++ b/Zend/tests/type_casts/cast_to_double.phpt
@@ -1,5 +1,5 @@
 --TEST--
-casting different variables to double
+casting different variables to float
 --INI--
 precision=14
 --FILE--
@@ -32,7 +32,7 @@ $vars = array(
 );
 
 foreach ($vars as $var) {
-    $tmp = (double)$var;
+    $tmp = (float)$var;
     var_dump($tmp);
 }
 
diff --git a/Zend/tests/type_casts/non_canonical_binary_cast.phpt b/Zend/tests/type_casts/non_canonical_binary_cast.phpt
new file mode 100644
index 0000000000000..2a24ef5f721c4
--- /dev/null
+++ b/Zend/tests/type_casts/non_canonical_binary_cast.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Non canonical (binary) cast
+--FILE--
+<?php
+
+var_dump((binary) 42);
+
+?>
+--EXPECTF--
+Deprecated: Non-canonical cast (binary) is deprecated, use the (string) cast instead in %s on line %d
+int(42)
diff --git a/Zend/tests/type_casts/non_canonical_boolean_cast.phpt b/Zend/tests/type_casts/non_canonical_boolean_cast.phpt
new file mode 100644
index 0000000000000..4d549a93ea064
--- /dev/null
+++ b/Zend/tests/type_casts/non_canonical_boolean_cast.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Non canonical (boolean) cast
+--FILE--
+<?php
+
+var_dump((boolean) 42);
+
+?>
+--EXPECTF--
+Deprecated: Non-canonical cast (boolean) is deprecated, use the (bool) cast instead in %s on line %d
+int(42)
diff --git a/Zend/tests/type_casts/non_canonical_double_cast.phpt b/Zend/tests/type_casts/non_canonical_double_cast.phpt
new file mode 100644
index 0000000000000..043517cd1be98
--- /dev/null
+++ b/Zend/tests/type_casts/non_canonical_double_cast.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Non canonical (double) cast
+--FILE--
+<?php
+
+var_dump((double) 42);
+
+?>
+--EXPECTF--
+Deprecated: Non-canonical cast (double) is deprecated, use the (float) cast instead in %s on line %d
+int(42)
diff --git a/Zend/tests/type_casts/non_canonical_integer_cast.phpt b/Zend/tests/type_casts/non_canonical_integer_cast.phpt
new file mode 100644
index 0000000000000..4f428ff9d53e0
--- /dev/null
+++ b/Zend/tests/type_casts/non_canonical_integer_cast.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Non canonical (integer) cast
+--FILE--
+<?php
+
+var_dump((integer) "42");
+
+?>
+--EXPECTF--
+Deprecated: Non-canonical cast (integer) is deprecated, use the (int) cast instead in %s on line %d
+int(42)
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
index 8d2c0077efa40..1172cba2d4f16 100644
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@ -2310,7 +2310,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 				case IS_NULL:      PREFIX_OP("(unset)",  240, 241);
 				case _IS_BOOL:     PREFIX_OP("(bool)",   240, 241);
 				case IS_LONG:      PREFIX_OP("(int)",    240, 241);
-				case IS_DOUBLE:    PREFIX_OP("(double)", 240, 241);
+				case IS_DOUBLE:    PREFIX_OP("(float)", 240, 241);
 				case IS_STRING:    PREFIX_OP("(string)", 240, 241);
 				case IS_ARRAY:     PREFIX_OP("(array)",  240, 241);
 				case IS_OBJECT:    PREFIX_OP("(object)", 240, 241);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 07ea669ae8e6c..12d93716817a7 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -212,7 +212,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %token T_INC "'++'"
 %token T_DEC "'--'"
 %token T_INT_CAST    "'(int)'"
-%token T_DOUBLE_CAST "'(double)'"
+%token T_DOUBLE_CAST "'(float)'"
 %token T_STRING_CAST "'(string)'"
 %token T_ARRAY_CAST  "'(array)'"
 %token T_OBJECT_CAST "'(object)'"
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 77437efb2d5c1..7bbfd2b34e771 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1629,14 +1629,28 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN_WITH_IDENT(T_VAR);
 }
 
-<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("int"|"integer"){TABS_AND_SPACES}")" {
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("int"){TABS_AND_SPACES}")" {
 	RETURN_TOKEN(T_INT_CAST);
 }
 
-<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("double"|"float"){TABS_AND_SPACES}")" {
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("integer"){TABS_AND_SPACES}")" {
+	if (PARSER_MODE()) {
+		zend_error(E_DEPRECATED, "Non-canonical cast (integer) is deprecated, use the (int) cast instead");
+	}
+	RETURN_TOKEN(T_INT_CAST);
+}
+
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("float"){TABS_AND_SPACES}")" {
 	RETURN_TOKEN(T_DOUBLE_CAST);
 }
 
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("double"){TABS_AND_SPACES}")" {
+	if (PARSER_MODE()) {
+		zend_error(E_DEPRECATED, "Non-canonical cast (double) is deprecated, use the (float) cast instead");
+	}
+	RETURN_TOKEN(T_INT_CAST);
+}
+
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}"real"{TABS_AND_SPACES}")" {
 	if (PARSER_MODE()) {
 		zend_throw_exception(zend_ce_parse_error, "The (real) cast has been removed, use (float) instead", 0);
@@ -1645,10 +1659,17 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN(T_DOUBLE_CAST);
 }
 
-<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("string"|"binary"){TABS_AND_SPACES}")" {
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("string"){TABS_AND_SPACES}")" {
 	RETURN_TOKEN(T_STRING_CAST);
 }
 
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("binary"){TABS_AND_SPACES}")" {
+	if (PARSER_MODE()) {
+		zend_error(E_DEPRECATED, "Non-canonical cast (binary) is deprecated, use the (string) cast instead");
+	}
+	RETURN_TOKEN(T_INT_CAST);
+}
+
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}"array"{TABS_AND_SPACES}")" {
 	RETURN_TOKEN(T_ARRAY_CAST);
 }
@@ -1657,10 +1678,17 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN(T_OBJECT_CAST);
 }
 
-<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("bool"|"boolean"){TABS_AND_SPACES}")" {
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("bool"){TABS_AND_SPACES}")" {
 	RETURN_TOKEN(T_BOOL_CAST);
 }
 
+<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("boolean"){TABS_AND_SPACES}")" {
+	if (PARSER_MODE()) {
+		zend_error(E_DEPRECATED, "Non-canonical cast (boolean) is deprecated, use the (bool) cast instead");
+	}
+	RETURN_TOKEN(T_INT_CAST);
+}
+
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("unset"){TABS_AND_SPACES}")" {
 	RETURN_TOKEN(T_UNSET_CAST);
 }
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index fa757667c33d5..fd4dc05a7ea6c 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -3970,40 +3970,36 @@ PHP_FUNCTION(date_diff)
 
 static bool timezone_initialize(php_timezone_obj *tzobj, const zend_string *tz_zstr, char **warning_message) /* {{{ */
 {
-	timelib_time *dummy_t = ecalloc(1, sizeof(timelib_time));
+	timelib_time  dummy_t = {0};
 	int           dst, not_found;
 	const char *tz = ZSTR_VAL(tz_zstr);
 
 	ZEND_ASSERT(!zend_str_has_nul_byte(tz_zstr) && "timezone should have been checked to not have null bytes");
 
-	dummy_t->z = timelib_parse_zone(&tz, &dst, dummy_t, &not_found, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
-	if ((dummy_t->z >= (100 * 60 * 60)) || (dummy_t->z <= (-100 * 60 * 60))) {
+	dummy_t.z = timelib_parse_zone(&tz, &dst, &dummy_t, &not_found, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
+	if ((dummy_t.z >= (100 * 60 * 60)) || (dummy_t.z <= (-100 * 60 * 60))) {
 		if (warning_message) {
 			spprintf(warning_message, 0, "Timezone offset is out of range (%s)", ZSTR_VAL(tz_zstr));
 		}
-		timelib_free(dummy_t->tz_abbr);
-		efree(dummy_t);
+		timelib_free(dummy_t.tz_abbr);
 		return false;
 	}
-	dummy_t->dst = dst;
+	dummy_t.dst = dst;
 	if (!not_found && (*tz != '\0')) {
 		if (warning_message) {
 			spprintf(warning_message, 0, "Unknown or bad timezone (%s)", ZSTR_VAL(tz_zstr));
 		}
-		timelib_free(dummy_t->tz_abbr);
-		efree(dummy_t);
+		timelib_free(dummy_t.tz_abbr);
 		return false;
 	}
 	if (not_found) {
 		if (warning_message) {
 			spprintf(warning_message, 0, "Unknown or bad timezone (%s)", ZSTR_VAL(tz_zstr));
 		}
-		efree(dummy_t);
 		return false;
 	} else {
-		set_timezone_from_timelib_time(tzobj, dummy_t);
-		timelib_free(dummy_t->tz_abbr);
-		efree(dummy_t);
+		set_timezone_from_timelib_time(tzobj, &dummy_t);
+		timelib_free(dummy_t.tz_abbr);
 		return true;
 	}
 } /* }}} */
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index e99c793597678..f11e121bb386d 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -31,10 +31,11 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/standard/file.h" /* needed for context stuff */
+#include "Zend/zend_attributes.h"
+#include "Zend/zend_exceptions.h"
 #include "php_fileinfo.h"
 #include "fileinfo_arginfo.h"
 #include "fopen_wrappers.h" /* needed for is_url */
-#include "Zend/zend_exceptions.h"
 
 static zend_object_handlers finfo_object_handlers;
 zend_class_entry *finfo_class_entry;
diff --git a/ext/fileinfo/fileinfo.stub.php b/ext/fileinfo/fileinfo.stub.php
index 2dba0fe2659ef..238ad7c14809b 100644
--- a/ext/fileinfo/fileinfo.stub.php
+++ b/ext/fileinfo/fileinfo.stub.php
@@ -92,6 +92,7 @@ public function set_flags(int $flags): true {}
 /** @refcount 1 */
 function finfo_open(int $flags = FILEINFO_NONE, ?string $magic_database = null): finfo|false {}
 
+#[\Deprecated(since: '8.5', message: 'as finfo objects are freed automatically')]
 function finfo_close(finfo $finfo): true {}
 
 function finfo_set_flags(finfo $finfo, int $flags): true {}
diff --git a/ext/fileinfo/fileinfo_arginfo.h b/ext/fileinfo/fileinfo_arginfo.h
index 024e7d4b6bd59..ac6ba0f591f98 100644
--- a/ext/fileinfo/fileinfo_arginfo.h
+++ b/ext/fileinfo/fileinfo_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d5bc322159e4af87077c07ddaca0a77803b4743a */
+ * Stub hash: 311d1049e32af017b44e260a00f13830714b1e96 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_finfo_open, 0, 0, finfo, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FILEINFO_NONE")
@@ -63,7 +63,7 @@ ZEND_FUNCTION(mime_content_type);
 
 static const zend_function_entry ext_functions[] = {
 	ZEND_FE(finfo_open, arginfo_finfo_open)
-	ZEND_FE(finfo_close, arginfo_finfo_close)
+	ZEND_RAW_FENTRY("finfo_close", zif_finfo_close, arginfo_finfo_close, ZEND_ACC_DEPRECATED, NULL, NULL)
 	ZEND_FE(finfo_set_flags, arginfo_finfo_set_flags)
 	ZEND_FE(finfo_file, arginfo_finfo_file)
 	ZEND_FE(finfo_buffer, arginfo_finfo_buffer)
@@ -96,6 +96,14 @@ static void register_fileinfo_symbols(int module_number)
 #endif
 	REGISTER_LONG_CONSTANT("FILEINFO_APPLE", MAGIC_APPLE, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("FILEINFO_EXTENSION", MAGIC_EXTENSION, CONST_PERSISTENT);
+
+
+	zend_attribute *attribute_Deprecated_func_finfo_close_0 = zend_add_function_attribute(zend_hash_str_find_ptr(CG(function_table), "finfo_close", sizeof("finfo_close") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
+	ZVAL_STR(&attribute_Deprecated_func_finfo_close_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5));
+	attribute_Deprecated_func_finfo_close_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
+	zend_string *attribute_Deprecated_func_finfo_close_0_arg1_str = zend_string_init("as finfo objects are freed automatically", strlen("as finfo objects are freed automatically"), 1);
+	ZVAL_STR(&attribute_Deprecated_func_finfo_close_0->args[1].value, attribute_Deprecated_func_finfo_close_0_arg1_str);
+	attribute_Deprecated_func_finfo_close_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
 }
 
 static zend_class_entry *register_class_finfo(void)
diff --git a/ext/fileinfo/tests/finfo_close_basic.phpt b/ext/fileinfo/tests/finfo_close_basic.phpt
index cdaf4b23b0002..1abd7216390dc 100644
--- a/ext/fileinfo/tests/finfo_close_basic.phpt
+++ b/ext/fileinfo/tests/finfo_close_basic.phpt
@@ -23,6 +23,8 @@ unset( $finfo );
 *** Testing finfo_close() : basic functionality ***
 object(finfo)#%d (0) {
 }
+
+Deprecated: Function finfo_close() is deprecated since 8.5, as finfo objects are freed automatically in %s on line %d
 bool(true)
 object(finfo)#%d (%d) {
 }
diff --git a/ext/fileinfo/tests/finfo_close_error.phpt b/ext/fileinfo/tests/finfo_close_error.phpt
index c43597f26a4e5..c7873b462724e 100644
--- a/ext/fileinfo/tests/finfo_close_error.phpt
+++ b/ext/fileinfo/tests/finfo_close_error.phpt
@@ -15,8 +15,10 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing finfo_close() : error conditions ***
 
 -- Testing finfo_close() function with wrong resource type --
+
+Deprecated: Function finfo_close() is deprecated since 8.5, as finfo objects are freed automatically in %s on line %d
 finfo_close(): Argument #1 ($finfo) must be of type finfo, resource given
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php
index 078ecb0c2daac..56602da0ec22f 100644
--- a/ext/intl/calendar/calendar.stub.php
+++ b/ext/intl/calendar/calendar.stub.php
@@ -90,11 +90,10 @@ class IntlCalendar
     private function __construct() {}
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @tentative-return-type
      * @alias intlcal_create_instance
      */
-    public static function createInstance($timezone = null, ?string $locale = null): ?IntlCalendar {}
+    public static function createInstance(IntlTimeZone|DateTimeZone|string|null $timezone = null, ?string $locale = null): ?IntlCalendar {}
 
     /**
      * @tentative-return-type
@@ -355,11 +354,9 @@ public function setSkippedWallTimeOption(int $option): true {}
     public function setTime(float $timestamp): bool {}
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @tentative-return-type
-     * @alias intlcal_set_time_zone
      */
-    public function setTimeZone($timezone): bool {}
+    public function setTimeZone(IntlTimeZone|DateTimeZone|string|null $timezone): bool {}
 
     /**
      * @tentative-return-type
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
index 9e050539b2e87..415113b613a2e 100644
--- a/ext/intl/calendar/calendar_arginfo.h
+++ b/ext/intl/calendar/calendar_arginfo.h
@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c014b88c9b6aa145ea20cc1f3fd719fe9f3d6966 */
+ * Stub hash: 2fc12d1fde65efbec4305f4934a3f4b25282a552 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlCalendar_createInstance, 0, 0, IntlCalendar, 1)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
@@ -165,7 +165,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_set
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_setTimeZone, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, timezone)
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlCalendar_toDateTime, 0, 0, DateTime, MAY_BE_FALSE)
@@ -249,7 +249,7 @@ ZEND_FUNCTION(intlcal_set_lenient);
 ZEND_FUNCTION(intlcal_set_repeated_wall_time_option);
 ZEND_FUNCTION(intlcal_set_skipped_wall_time_option);
 ZEND_FUNCTION(intlcal_set_time);
-ZEND_FUNCTION(intlcal_set_time_zone);
+ZEND_METHOD(IntlCalendar, setTimeZone);
 ZEND_FUNCTION(intlcal_to_date_time);
 ZEND_METHOD(IntlGregorianCalendar, createFromDate);
 ZEND_METHOD(IntlGregorianCalendar, createFromDateTime);
@@ -305,7 +305,7 @@ static const zend_function_entry class_IntlCalendar_methods[] = {
 	ZEND_RAW_FENTRY("setRepeatedWallTimeOption", zif_intlcal_set_repeated_wall_time_option, arginfo_class_IntlCalendar_setRepeatedWallTimeOption, ZEND_ACC_PUBLIC, NULL, NULL)
 	ZEND_RAW_FENTRY("setSkippedWallTimeOption", zif_intlcal_set_skipped_wall_time_option, arginfo_class_IntlCalendar_setSkippedWallTimeOption, ZEND_ACC_PUBLIC, NULL, NULL)
 	ZEND_RAW_FENTRY("setTime", zif_intlcal_set_time, arginfo_class_IntlCalendar_setTime, ZEND_ACC_PUBLIC, NULL, NULL)
-	ZEND_RAW_FENTRY("setTimeZone", zif_intlcal_set_time_zone, arginfo_class_IntlCalendar_setTimeZone, ZEND_ACC_PUBLIC, NULL, NULL)
+	ZEND_ME(IntlCalendar, setTimeZone, arginfo_class_IntlCalendar_setTimeZone, ZEND_ACC_PUBLIC)
 	ZEND_RAW_FENTRY("toDateTime", zif_intlcal_to_date_time, arginfo_class_IntlCalendar_toDateTime, ZEND_ACC_PUBLIC, NULL, NULL)
 	ZEND_FE_END
 };
diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp
index d668cd66df9a6..c404286fe0944 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -72,21 +72,21 @@ U_CFUNC PHP_METHOD(IntlCalendar, __construct)
 
 U_CFUNC PHP_FUNCTION(intlcal_create_instance)
 {
-	zval		*zv_timezone	= NULL;
+	zend_object *timezone_object = nullptr;
+	zend_string *timezone_string = nullptr;
 	char	        *locale_str	= NULL;
 	size_t		locale_len      = 0;
-	TimeZone	*timeZone;
 	UErrorCode	status			= U_ZERO_ERROR;
 	intl_error_reset(NULL);
 
 	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_ZVAL(zv_timezone)
+		Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
 		Z_PARAM_STRING_OR_NULL(locale_str, locale_len)
 	ZEND_PARSE_PARAMETERS_END();
 
-	timeZone = timezone_process_timezone_argument(zv_timezone, NULL);
-	if (timeZone == NULL) {
+	TimeZone *timeZone = timezone_process_timezone_argument(timezone_object, timezone_string, nullptr);
+	if (timeZone == nullptr) {
 		RETURN_NULL();
 	}
 
@@ -296,26 +296,28 @@ U_CFUNC PHP_FUNCTION(intlcal_add)
 	RETURN_TRUE;
 }
 
+/* {{{ Set formatter's timezone. */
 U_CFUNC PHP_FUNCTION(intlcal_set_time_zone)
 {
-	zval			*zv_timezone;
-	TimeZone		*timeZone;
+	zend_object *timezone_object = nullptr;
+	zend_string *timezone_string = nullptr;
+
 	CALENDAR_METHOD_INIT_VARS;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
-			"Oz!", &object, Calendar_ce_ptr, &zv_timezone) == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_OBJECT_OF_CLASS(object, Calendar_ce_ptr)
+		Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
+	ZEND_PARSE_PARAMETERS_END();
 
 	CALENDAR_METHOD_FETCH_OBJECT;
 
-	if (zv_timezone == NULL) {
+	if (timezone_object == nullptr && timezone_string == nullptr) {
 		RETURN_TRUE; /* the method does nothing if passed null */
 	}
 
-	timeZone = timezone_process_timezone_argument(zv_timezone,
-			CALENDAR_ERROR_P(co));
-	if (timeZone == NULL) {
+	TimeZone *timeZone = timezone_process_timezone_argument(
+		timezone_object, timezone_string, CALENDAR_ERROR_P(co));
+	if (timeZone == nullptr) {
 		RETURN_FALSE;
 	}
 
@@ -324,6 +326,34 @@ U_CFUNC PHP_FUNCTION(intlcal_set_time_zone)
 	RETURN_TRUE;
 }
 
+U_CFUNC PHP_METHOD(IntlCalendar, setTimeZone)
+{
+	zend_object *timezone_object = nullptr;
+	zend_string *timezone_string = nullptr;
+
+	CALENDAR_METHOD_INIT_VARS;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
+	ZEND_PARSE_PARAMETERS_END();
+
+	object = ZEND_THIS;
+	CALENDAR_METHOD_FETCH_OBJECT;
+
+	if (timezone_object == nullptr && timezone_string == nullptr) {
+		RETURN_TRUE; /* the method does nothing if passed null */
+	}
+
+	TimeZone *timeZone = timezone_process_timezone_argument(
+		timezone_object, timezone_string, CALENDAR_ERROR_P(co));
+	if (timeZone == nullptr) {
+		RETURN_FALSE;
+	}
+
+	co->ucal->adoptTimeZone(timeZone);
+
+	RETURN_TRUE;
+}
 
 static void _php_intlcal_before_after(
 		UBool (Calendar::*func)(const Calendar&, UErrorCode&) const,
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
index 8796e01f6381f..0cc3a94d4c568 100644
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -77,7 +77,8 @@ static bool set_gregorian_calendar_time_zone(GregorianCalendar *gcal, UErrorCode
 
 static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS, bool is_constructor)
 {
-	zval		*tz_object	= NULL;
+	zend_object *timezone_object = nullptr;
+	zend_string *timezone_string = nullptr;
 	zval		args_a[6],
 				*args		= &args_a[0];
 	char		*locale		= NULL;
@@ -112,15 +113,23 @@ static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS, bool
 
 	// argument parsing
 	if (variant <= 2) {
-		if (zend_parse_parameters(MIN(ZEND_NUM_ARGS(), 2),
-                               "|z!s!", &tz_object, &locale, &locale_len) == FAILURE) {
-                       RETURN_THROWS();
-               }
-       }
-       if (variant > 2 && zend_parse_parameters(ZEND_NUM_ARGS(),
-                       "lll|lll", &largs[0], &largs[1], &largs[2], &largs[3], &largs[4],
-                       &largs[5]) == FAILURE) {
-               RETURN_THROWS();
+		/* These dummy variables are needed because the 2 param constructor allows trailing nulls... */
+		zval *dummy1, *dummy2, *dummy3, *dummy4;
+		ZEND_PARSE_PARAMETERS_START(0, 6)
+			Z_PARAM_OPTIONAL
+			Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
+			Z_PARAM_STRING_OR_NULL(locale, locale_len)
+			Z_PARAM_ZVAL(dummy1)
+			Z_PARAM_ZVAL(dummy2)
+			Z_PARAM_ZVAL(dummy3)
+			Z_PARAM_ZVAL(dummy4)
+		ZEND_PARSE_PARAMETERS_END();
+	}
+	if (variant > 2
+		&& zend_parse_parameters(ZEND_NUM_ARGS(), "lll|lll",
+			&largs[0], &largs[1], &largs[2], &largs[3], &largs[4], &largs[5]) == FAILURE
+	) {
+		RETURN_THROWS();
 	}
 
 	// instantion of ICU object
@@ -134,8 +143,8 @@ static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS, bool
 
 	if (variant <= 2) {
 		// From timezone and locale (0 to 2 arguments)
-		TimeZone *tz = timezone_process_timezone_argument(tz_object, NULL);
-		if (tz == NULL) {
+		TimeZone *tz = timezone_process_timezone_argument(timezone_object, timezone_string, nullptr);
+		if (tz == nullptr) {
 			// TODO: Exception should always occur already?
 			if (!EG(exception)) {
 				zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0);
diff --git a/ext/intl/dateformat/dateformat.stub.php b/ext/intl/dateformat/dateformat.stub.php
index 7582af2717fbe..89ebc5f61c0ec 100644
--- a/ext/intl/dateformat/dateformat.stub.php
+++ b/ext/intl/dateformat/dateformat.stub.php
@@ -32,20 +32,18 @@ class IntlDateFormatter
     public const int TRADITIONAL = UNKNOWN;
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @param IntlCalendar|int|null $calendar
      */
     public function __construct(
         ?string $locale,
         int $dateType = IntlDateFormatter::FULL,
         int $timeType = IntlDateFormatter::FULL,
-        $timezone = null,
+        IntlTimeZone|DateTimeZone|string|null $timezone = null,
         $calendar = null,
         ?string $pattern = null
     ) {}
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @tentative-return-type
      * @alias datefmt_create
      */
@@ -53,7 +51,7 @@ public static function create(
         ?string $locale,
         int $dateType = IntlDateFormatter::FULL,
         int $timeType = IntlDateFormatter::FULL,
-        $timezone = null,
+        IntlTimeZone|DateTimeZone|string|null $timezone = null,
         IntlCalendar|int|null $calendar = null,
         ?string $pattern = null
     ): ?IntlDateFormatter {}
@@ -101,11 +99,9 @@ public function getCalendarObject(): IntlCalendar|false|null {}
     public function getTimeZone(): IntlTimeZone|false {}
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @tentative-return-type
-     * @alias datefmt_set_timezone
      */
-    public function setTimeZone($timezone): bool {}
+    public function setTimeZone(IntlTimeZone|DateTimeZone|string|null $timezone): bool {}
 
     /**
      * @tentative-return-type
diff --git a/ext/intl/dateformat/dateformat_arginfo.h b/ext/intl/dateformat/dateformat_arginfo.h
index b57cb79468f2b..d6d0306506f81 100644
--- a/ext/intl/dateformat/dateformat_arginfo.h
+++ b/ext/intl/dateformat/dateformat_arginfo.h
@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 56b66b1b51220ddbff698ec4c9a6ae60f3e0bfb0 */
+ * Stub hash: 160d05ec65c45b66b13eaecbef20b3c59bfb33d1 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dateType, IS_LONG, 0, "IntlDateFormatter::FULL")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeType, IS_LONG, 0, "IntlDateFormatter::FULL")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, "null")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, calendar, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
@@ -14,7 +14,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlDateFormatter
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dateType, IS_LONG, 0, "IntlDateFormatter::FULL")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeType, IS_LONG, 0, "IntlDateFormatter::FULL")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, "null")
 	ZEND_ARG_OBJ_TYPE_MASK(0, calendar, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
@@ -40,7 +40,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlDateForm
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_setTimeZone, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, timezone)
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_setPattern, 0, 1, _IS_BOOL, 0)
@@ -100,7 +100,7 @@ ZEND_FUNCTION(datefmt_set_calendar);
 ZEND_FUNCTION(datefmt_get_timezone_id);
 ZEND_FUNCTION(datefmt_get_calendar_object);
 ZEND_FUNCTION(datefmt_get_timezone);
-ZEND_FUNCTION(datefmt_set_timezone);
+ZEND_METHOD(IntlDateFormatter, setTimeZone);
 ZEND_FUNCTION(datefmt_set_pattern);
 ZEND_FUNCTION(datefmt_get_pattern);
 ZEND_FUNCTION(datefmt_get_locale);
@@ -124,7 +124,7 @@ static const zend_function_entry class_IntlDateFormatter_methods[] = {
 	ZEND_RAW_FENTRY("getTimeZoneId", zif_datefmt_get_timezone_id, arginfo_class_IntlDateFormatter_getTimeZoneId, ZEND_ACC_PUBLIC, NULL, NULL)
 	ZEND_RAW_FENTRY("getCalendarObject", zif_datefmt_get_calendar_object, arginfo_class_IntlDateFormatter_getCalendarObject, ZEND_ACC_PUBLIC, NULL, NULL)
 	ZEND_RAW_FENTRY("getTimeZone", zif_datefmt_get_timezone, arginfo_class_IntlDateFormatter_getTimeZone, ZEND_ACC_PUBLIC, NULL, NULL)
-	ZEND_RAW_FENTRY("setTimeZone", zif_datefmt_set_timezone, arginfo_class_IntlDateFormatter_setTimeZone, ZEND_ACC_PUBLIC, NULL, NULL)
+	ZEND_ME(IntlDateFormatter, setTimeZone, arginfo_class_IntlDateFormatter_setTimeZone, ZEND_ACC_PUBLIC)
 	ZEND_RAW_FENTRY("setPattern", zif_datefmt_set_pattern, arginfo_class_IntlDateFormatter_setPattern, ZEND_ACC_PUBLIC, NULL, NULL)
 	ZEND_RAW_FENTRY("getPattern", zif_datefmt_get_pattern, arginfo_class_IntlDateFormatter_getPattern, ZEND_ACC_PUBLIC, NULL, NULL)
 	ZEND_RAW_FENTRY("getLocale", zif_datefmt_get_locale, arginfo_class_IntlDateFormatter_getLocale, ZEND_ACC_PUBLIC, NULL, NULL)
diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp
index f95cc0f8de5be..13dadc9c96973 100644
--- a/ext/intl/dateformat/dateformat_attrcpp.cpp
+++ b/ext/intl/dateformat/dateformat_attrcpp.cpp
@@ -81,21 +81,46 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone)
 /* {{{ Set formatter's timezone. */
 U_CFUNC PHP_FUNCTION(datefmt_set_timezone)
 {
-	zval		*timezone_zv;
-	TimeZone	*timezone;
+	zend_object *timezone_object = nullptr;
+	zend_string *timezone_string = nullptr;
 
 	DATE_FORMAT_METHOD_INIT_VARS;
 
-	if ( zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
-			"Oz", &object, IntlDateFormatter_ce_ptr, &timezone_zv) == FAILURE) {
-		RETURN_THROWS();
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_OBJECT_OF_CLASS(object, IntlDateFormatter_ce_ptr)
+		Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
+	ZEND_PARSE_PARAMETERS_END();
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT;
+
+	TimeZone *timezone = timezone_process_timezone_argument(
+		timezone_object, timezone_string, INTL_DATA_ERROR_P(dfo));
+	if (timezone == nullptr) {
+		RETURN_FALSE;
 	}
 
+	fetch_datefmt(dfo)->adoptTimeZone(timezone);
+
+	RETURN_TRUE;
+}
+
+U_CFUNC PHP_METHOD(IntlDateFormatter, setTimeZone)
+{
+	zend_object *timezone_object = nullptr;
+	zend_string *timezone_string = nullptr;
+
+	DATE_FORMAT_METHOD_INIT_VARS;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
+	ZEND_PARSE_PARAMETERS_END();
+
+	object = ZEND_THIS;
 	DATE_FORMAT_METHOD_FETCH_OBJECT;
 
-	timezone = timezone_process_timezone_argument(timezone_zv,
-			INTL_DATA_ERROR_P(dfo));
-	if (timezone == NULL) {
+	TimeZone *timezone = timezone_process_timezone_argument(
+		timezone_object, timezone_string, INTL_DATA_ERROR_P(dfo));
+	if (timezone == nullptr) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp
index 2be1d81637419..d2d65bc267326 100644
--- a/ext/intl/dateformat/dateformat_create.cpp
+++ b/ext/intl/dateformat/dateformat_create.cpp
@@ -59,7 +59,8 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	Calendar *cal = NULL;
 	zend_long	calendar_type;
 	bool		calendar_owned;
-	zval		*timezone_zv	= NULL;
+	zend_object *timezone_object = nullptr;
+	zend_string *timezone_string = nullptr;
 	TimeZone	*timezone	= NULL;
 	bool		explicit_tz;
 	char*       pattern_str		= NULL;
@@ -76,7 +77,7 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(date_type)
 		Z_PARAM_LONG(time_type)
-		Z_PARAM_ZVAL(timezone_zv)
+		Z_PARAM_OBJ_OR_STR_OR_NULL(timezone_object, timezone_string)
 		Z_PARAM_OBJ_OF_CLASS_OR_LONG_OR_NULL(calendar_obj, Calendar_ce_ptr, calendar_long, calendar_is_null)
 		Z_PARAM_STRING_OR_NULL(pattern_str, pattern_str_len)
 	ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
@@ -120,13 +121,12 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	}
 
 	/* process timezone */
-	explicit_tz = timezone_zv != NULL && Z_TYPE_P(timezone_zv) != IS_NULL;
+	explicit_tz = timezone_object != nullptr || timezone_string != nullptr;
 
 	if (explicit_tz || calendar_owned ) {
 		//we have an explicit time zone or a non-object calendar
-		timezone = timezone_process_timezone_argument(timezone_zv,
-				INTL_DATA_ERROR_P(dfo));
-		if (timezone == NULL) {
+		timezone = timezone_process_timezone_argument(timezone_object, timezone_string, INTL_DATA_ERROR_P(dfo));
+		if (timezone == nullptr) {
 			goto error;
 		}
 	}
diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp
index 080dba6cfe2ef..e734b2df27b84 100644
--- a/ext/intl/msgformat/msgformat_helpers.cpp
+++ b/ext/intl/msgformat/msgformat_helpers.cpp
@@ -341,9 +341,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo,
 		}
 
 		if (used_tz == NULL) {
-			zval nullzv;
-			ZVAL_NULL(&nullzv);
-			used_tz = timezone_process_timezone_argument(&nullzv, &err);
+			used_tz = timezone_process_timezone_argument(nullptr, nullptr, &err);
 			if (used_tz == NULL) {
 				continue;
 			}
diff --git a/ext/intl/php_intl.stub.php b/ext/intl/php_intl.stub.php
index af1ce6f1edbbb..d2ca22c6d299a 100644
--- a/ext/intl/php_intl.stub.php
+++ b/ext/intl/php_intl.stub.php
@@ -173,8 +173,7 @@ class IntlException extends Exception
 
 /* calendar */
 
-/** @param IntlTimeZone|DateTimeZone|string|null $timezone */
-function intlcal_create_instance($timezone = null, ?string $locale = null): ?IntlCalendar {}
+function intlcal_create_instance(IntlTimeZone|DateTimeZone|string|null $timezone = null, ?string $locale = null): ?IntlCalendar {}
 
 function intlcal_get_keyword_values_for_locale(string $keyword, string $locale, bool $onlyCommon): IntlIterator|false {}
 
@@ -194,8 +193,7 @@ function intlcal_set_time(IntlCalendar $calendar, float $timestamp): bool {}
 
 function intlcal_add(IntlCalendar $calendar, int $field, int $value): bool {}
 
-/** @param IntlTimeZone|DateTimeZone|string|null $timezone */
-function intlcal_set_time_zone(IntlCalendar $calendar, $timezone): bool {}
+function intlcal_set_time_zone(IntlCalendar $calendar, IntlTimeZone|DateTimeZone|string|null $timezone): bool {}
 
 function intlcal_after(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
@@ -328,12 +326,11 @@ function intl_error_name(int $errorCode): string {}
 
 /* dateformat */
 
-/** @param IntlTimeZone|DateTimeZone|string|null $timezone */
 function datefmt_create(
     ?string $locale,
     int $dateType = IntlDateFormatter::FULL,
     int $timeType = IntlDateFormatter::FULL,
-    $timezone = null,
+    IntlTimeZone|DateTimeZone|string|null $timezone = null,
     IntlCalendar|int|null $calendar = null,
     ?string $pattern = null
 ): ?IntlDateFormatter {}
@@ -352,8 +349,7 @@ function datefmt_get_calendar_object(IntlDateFormatter $formatter): IntlCalendar
 
 function datefmt_get_timezone(IntlDateFormatter $formatter): IntlTimeZone|false {}
 
-/** @param IntlTimeZone|DateTimeZone|string|null $timezone */
-function datefmt_set_timezone(IntlDateFormatter $formatter, $timezone): bool {}
+function datefmt_set_timezone(IntlDateFormatter $formatter, IntlTimeZone|DateTimeZone|string|null $timezone): bool {}
 
 function datefmt_set_pattern(IntlDateFormatter $formatter, string $pattern): bool {}
 
diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h
index 8f3ba5041542b..012e274296a50 100644
--- a/ext/intl/php_intl_arginfo.h
+++ b/ext/intl/php_intl_arginfo.h
@@ -1,8 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: bd78e0b6aec5c52b13f83e3c3cc7770c942d7c20 */
+ * Stub hash: 3fa507cf4ace635ae620050db9662b3979890bc1 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
@@ -40,7 +40,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_time_zone, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_INFO(0, timezone)
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_after, 0, 2, _IS_BOOL, 0)
@@ -280,7 +280,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_datefmt_create, 0, 1, IntlDateFor
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dateType, IS_LONG, 0, "IntlDateFormatter::FULL")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeType, IS_LONG, 0, "IntlDateFormatter::FULL")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, "null")
 	ZEND_ARG_OBJ_TYPE_MASK(0, calendar, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
@@ -312,7 +312,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_timezone, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
-	ZEND_ARG_INFO(0, timezone)
+	ZEND_ARG_OBJ_TYPE_MASK(0, timezone, IntlTimeZone|DateTimeZone, MAY_BE_STRING|MAY_BE_NULL, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_pattern, 0, 2, _IS_BOOL, 0)
diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt
index 633d385323a6f..08ed8876d2f7e 100644
--- a/ext/intl/tests/dateformat_setTimeZone_error.phpt
+++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt
@@ -12,17 +12,16 @@ $df = new IntlDateFormatter(NULL, 0, 0);
 
 try {
 	$df->setTimeZone(array());
-} catch (IntlException $e) {
-	echo $e->getMessage() . PHP_EOL;
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
 try {
 	$df->setTimeZone('non existing timezone');
-} catch (IntlException $e) {
-	echo $e->getMessage();
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 ?>
---EXPECTF--
-Warning: Array to string conversion in %s on line %d
-IntlDateFormatter::setTimeZone(): No such time zone: "Array"
-IntlDateFormatter::setTimeZone(): No such time zone: "non existing timezone"
+--EXPECT--
+TypeError: IntlDateFormatter::setTimeZone(): Argument #1 ($timezone) must be of type object|string|null, array given
+IntlException: IntlDateFormatter::setTimeZone(): No such time zone: "non existing timezone"
diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp
index 0737d99423110..b5aed942d1c5c 100644
--- a/ext/intl/timezone/timezone_class.cpp
+++ b/ext/intl/timezone/timezone_class.cpp
@@ -131,73 +131,85 @@ static void timezone_throw_exception_with_call_location(const char *msg, const c
 }
 
 /* {{{ timezone_process_timezone_argument
- * TimeZone argument processor. outside_error may be NULL (for static functions/constructors) */
-U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
-													 intl_error *outside_error)
+ * TimeZone argument processor. outside_error may be nullptr (for static functions/constructors) */
+U_CFUNC TimeZone *timezone_process_timezone_argument(
+	zend_object *timezone_object, zend_string *timezone_string, intl_error *outside_error)
 {
-	zval		local_zv_tz;
 	std::unique_ptr<TimeZone>	timeZone;
+	bool free_string = false;
 
-	if (zv_timezone == NULL || Z_TYPE_P(zv_timezone) == IS_NULL) {
+	if (timezone_object == nullptr && timezone_string == nullptr) {
 		timelib_tzinfo *tzinfo = get_timezone_info();
-		ZVAL_STRING(&local_zv_tz, tzinfo->name);
-		zv_timezone = &local_zv_tz;
-	} else {
-		ZVAL_NULL(&local_zv_tz);
+		timezone_string = zend_string_init(tzinfo->name, strlen(tzinfo->name), false);
+		free_string = true;
 	}
 
-	if (Z_TYPE_P(zv_timezone) == IS_OBJECT &&
-			instanceof_function(Z_OBJCE_P(zv_timezone), TimeZone_ce_ptr)) {
-		TimeZone_object *to = Z_INTL_TIMEZONE_P(zv_timezone);
-
-		if (to->utimezone == NULL) {
-			timezone_throw_exception_with_call_location("passed IntlTimeZone is not "
-				"properly constructed", NULL);
-			zval_ptr_dtor_str(&local_zv_tz);
-			return NULL;
-		}
-		timeZone = std::unique_ptr<TimeZone>(to->utimezone->clone());
-		if (UNEXPECTED(timeZone == NULL)) {
-			timezone_throw_exception_with_call_location("could not clone TimeZone", NULL);
-			zval_ptr_dtor_str(&local_zv_tz);
-			return NULL;
+	if (timezone_object != nullptr) {
+		if (instanceof_function(timezone_object->ce, TimeZone_ce_ptr)) {
+			const TimeZone_object *to = php_intl_timezone_fetch_object(timezone_object);
+
+			if (UNEXPECTED(to->utimezone == nullptr)) {
+				timezone_throw_exception_with_call_location(
+					"passed IntlTimeZone is not properly constructed",nullptr);
+				return nullptr;
+			}
+			timeZone = std::unique_ptr<TimeZone>(to->utimezone->clone());
+			if (UNEXPECTED(timeZone == nullptr)) {
+				timezone_throw_exception_with_call_location("could not clone TimeZone", nullptr);
+				return nullptr;
+			}
+			// well, this is included by the centralized C intl part so the "smart" part can't go further
+			return timeZone.release();
+		} else if (instanceof_function(timezone_object->ce, php_date_get_timezone_ce())) {
+			php_timezone_obj *tz_obj = php_timezone_obj_from_obj(timezone_object);
+
+			return timezone_convert_datetimezone(tz_obj->type, tz_obj, false, outside_error);
+		} else {
+			zval tmp;
+			zend_result status = timezone_object->handlers->cast_object(timezone_object, &tmp, IS_STRING);
+			if (EXPECTED(status == SUCCESS)) {
+				timezone_string = Z_STR(tmp);
+				free_string = true;
+			} else {
+				if (!EG(exception)) {
+					// TODO Proper type error
+					zend_throw_error(nullptr, "Object of class %s could not be converted to string", ZSTR_VAL(timezone_object->ce->name));
+				}
+				return nullptr;
+			}
 		}
-	} else if (Z_TYPE_P(zv_timezone) == IS_OBJECT &&
-			instanceof_function(Z_OBJCE_P(zv_timezone), php_date_get_timezone_ce())) {
+	}
 
-		php_timezone_obj *tzobj = Z_PHPTIMEZONE_P(zv_timezone);
+	ZEND_ASSERT(timezone_string != nullptr);
+	UnicodeString id;
+	UErrorCode status = U_ZERO_ERROR; /* outside_error may be nullptr */
 
-		zval_ptr_dtor_str(&local_zv_tz);
-		return timezone_convert_datetimezone(tzobj->type, tzobj, 0, outside_error);
-	} else {
-		UnicodeString	id;
-		UErrorCode		status = U_ZERO_ERROR; /* outside_error may be NULL */
-		if (!try_convert_to_string(zv_timezone)) {
-			zval_ptr_dtor_str(&local_zv_tz);
-			return NULL;
-		}
-		if (intl_stringFromChar(id, Z_STRVAL_P(zv_timezone), Z_STRLEN_P(zv_timezone),
-				&status) == FAILURE) {
-			timezone_throw_exception_with_call_location("Time zone identifier given is not a "
-				"valid UTF-8 string", NULL);
-			zval_ptr_dtor_str(&local_zv_tz);
-			return NULL;
+	if (UNEXPECTED(intl_stringFromChar(id, ZSTR_VAL(timezone_string), ZSTR_LEN(timezone_string), &status) == FAILURE)) {
+		timezone_throw_exception_with_call_location("Time zone identifier given is not a valid UTF-8 string", nullptr);
+		if (free_string) {
+			zend_string_release_ex(timezone_string, false);
 		}
-		timeZone = std::unique_ptr<TimeZone>(TimeZone::createTimeZone(id));
-		if (UNEXPECTED(timeZone == NULL)) {
-			timezone_throw_exception_with_call_location("Could not create time zone", NULL);
-			zval_ptr_dtor_str(&local_zv_tz);
-			return NULL;
+		return nullptr;
+	}
+
+	timeZone = std::unique_ptr<TimeZone>(TimeZone::createTimeZone(id));
+	if (UNEXPECTED(timeZone == nullptr)) {
+		timezone_throw_exception_with_call_location("Could not create time zone",nullptr);
+		if (free_string) {
+			zend_string_release_ex(timezone_string, false);
 		}
-		if (*timeZone == TimeZone::getUnknown()) {
-			timezone_throw_exception_with_call_location("No such time zone: ", Z_STRVAL_P(zv_timezone));
-			zval_ptr_dtor_str(&local_zv_tz);
-			return NULL;
+		return nullptr;
+	}
+	if (UNEXPECTED(*timeZone == TimeZone::getUnknown())) {
+		timezone_throw_exception_with_call_location("No such time zone: ", ZSTR_VAL(timezone_string));
+		if (free_string) {
+			zend_string_release_ex(timezone_string, false);
 		}
+		return nullptr;
+	}
+	if (free_string) {
+		zend_string_release_ex(timezone_string, false);
 	}
-
-	zval_ptr_dtor_str(&local_zv_tz);
-
 	// well, this is included by the centralized C intl part so the "smart" part can't go further
 	return timeZone.release();
 }
diff --git a/ext/intl/timezone/timezone_class.h b/ext/intl/timezone/timezone_class.h
index 08b78369e6fc5..bbfd8adcae23e 100644
--- a/ext/intl/timezone/timezone_class.h
+++ b/ext/intl/timezone/timezone_class.h
@@ -67,7 +67,7 @@ static inline TimeZone_object *php_intl_timezone_fetch_object(zend_object *obj)
 	}
 
 zval *timezone_convert_to_datetimezone(const TimeZone *timeZone, intl_error *outside_error, zval *ret);
-TimeZone *timezone_process_timezone_argument(zval *zv_timezone, intl_error *error);
+TimeZone *timezone_process_timezone_argument(zend_object *timezone_object, zend_string *timezone_string, intl_error *error);
 
 void timezone_object_construct(const TimeZone *zone, zval *object, int owned);
 
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index f4e50fbd7c885..4044f4de9ff57 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1160,8 +1160,8 @@ PHP_RSHUTDOWN_FUNCTION(mbstring)
 	MBSTRG(outconv_state) = 0;
 
 	if (MBSTRG(all_encodings_list)) {
-		GC_DELREF(MBSTRG(all_encodings_list));
-		zend_array_destroy(MBSTRG(all_encodings_list));
+		/* must be *array* release to remove from GC root buffer and free the hashtable itself */
+		zend_array_release(MBSTRG(all_encodings_list));
 		MBSTRG(all_encodings_list) = NULL;
 	}
 
diff --git a/ext/mbstring/tests/gh19397.phpt b/ext/mbstring/tests/gh19397.phpt
new file mode 100644
index 0000000000000..e6e07b161c089
--- /dev/null
+++ b/ext/mbstring/tests/gh19397.phpt
@@ -0,0 +1,11 @@
+--TEST--
+GH-19397 (mb_list_encodings() can cause crashes on shutdown)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+$doNotDeleteThisVariableAssignment = mb_list_encodings();
+var_dump(count($doNotDeleteThisVariableAssignment) > 0);
+?>
+--EXPECT--
+bool(true)
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index 06db6ac26860b..89c499ba8aa6a 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -1383,6 +1383,7 @@ function mysqli_error_list(mysqli $mysql): array {}
 function mysqli_stmt_execute(mysqli_stmt $statement, ?array $params = null): bool {}
 
 /** @alias mysqli_stmt_execute */
+#[\Deprecated(since: '8.5', message: "use mysqli_stmt_execute() instead")]
 function mysqli_execute(mysqli_stmt $statement, ?array $params = null): bool {}
 
 function mysqli_execute_query(mysqli $mysql, string $query, ?array $params = null): mysqli_result|bool {}
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index 0902b5f3438c1..52497844fb18b 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2547f63fd024fd5f4fecc574bbcff1301d1d36e5 */
+ * Stub hash: ce02f0eeb9191e7c92cb8a5e5fcae20fceb0b47c */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -837,7 +837,7 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(mysqli_error, arginfo_mysqli_error)
 	ZEND_FE(mysqli_error_list, arginfo_mysqli_error_list)
 	ZEND_FE(mysqli_stmt_execute, arginfo_mysqli_stmt_execute)
-	ZEND_RAW_FENTRY("mysqli_execute", zif_mysqli_stmt_execute, arginfo_mysqli_execute, 0, NULL, NULL)
+	ZEND_RAW_FENTRY("mysqli_execute", zif_mysqli_stmt_execute, arginfo_mysqli_execute, ZEND_ACC_DEPRECATED, NULL, NULL)
 	ZEND_FE(mysqli_execute_query, arginfo_mysqli_execute_query)
 	ZEND_FE(mysqli_fetch_field, arginfo_mysqli_fetch_field)
 	ZEND_FE(mysqli_fetch_fields, arginfo_mysqli_fetch_fields)
@@ -1150,6 +1150,13 @@ static void register_mysqli_symbols(int module_number)
 
 	zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "mysqli_connect", sizeof("mysqli_connect") - 1), 2, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);
 
+	zend_attribute *attribute_Deprecated_func_mysqli_execute_0 = zend_add_function_attribute(zend_hash_str_find_ptr(CG(function_table), "mysqli_execute", sizeof("mysqli_execute") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
+	ZVAL_STR(&attribute_Deprecated_func_mysqli_execute_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5));
+	attribute_Deprecated_func_mysqli_execute_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
+	zend_string *attribute_Deprecated_func_mysqli_execute_0_arg1_str = zend_string_init("use mysqli_stmt_execute() instead", strlen("use mysqli_stmt_execute() instead"), 1);
+	ZVAL_STR(&attribute_Deprecated_func_mysqli_execute_0->args[1].value, attribute_Deprecated_func_mysqli_execute_0_arg1_str);
+	attribute_Deprecated_func_mysqli_execute_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
+
 	zend_attribute *attribute_Deprecated_func_mysqli_kill_0 = zend_add_function_attribute(zend_hash_str_find_ptr(CG(function_table), "mysqli_kill", sizeof("mysqli_kill") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
 	ZVAL_STR(&attribute_Deprecated_func_mysqli_kill_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_4));
 	attribute_Deprecated_func_mysqli_kill_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 9588f23d420c5..af8149322f2e7 100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -347,6 +347,11 @@ PDO_API void php_pdo_internal_construct_driver(INTERNAL_FUNCTION_PARAMETERS, zen
 	}
 
 	if (!strncmp(data_source, "uri:", sizeof("uri:")-1)) {
+		zend_error(E_DEPRECATED, "Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs");
+		if (EG(exception)) {
+			RETURN_THROWS();
+		}
+
 		/* the specified URI holds connection details */
 		data_source = dsn_from_uri(data_source + sizeof("uri:")-1, alt_dsn, sizeof(alt_dsn));
 		if (!data_source) {
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
index ec6bce78b7c41..d86f9b3d8773d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
@@ -63,5 +63,8 @@ MySQLPDOTest::skip();
 
     print "done!";
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
+
+Deprecated: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
 done!
diff --git a/ext/pdo_sqlite/tests/pdo_sqlite___construct_uri.phpt b/ext/pdo_sqlite/tests/pdo_sqlite___construct_uri.phpt
new file mode 100644
index 0000000000000..7fc686b214723
--- /dev/null
+++ b/ext/pdo_sqlite/tests/pdo_sqlite___construct_uri.phpt
@@ -0,0 +1,48 @@
+--TEST--
+PDO_sqlite: PDO->__construct() - URI
+--EXTENSIONS--
+pdo_sqlite
+--FILE--
+<?php
+$dsnFile = __DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite___construct_uri.dsn";
+$dbFile = __DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite___construct_uri.db";
+file_put_contents($dsnFile, "sqlite:{$dbFile}");
+
+clearstatcache();
+var_dump(file_exists($dbFile));
+new PDO("uri:{$dsnFile}");
+
+clearstatcache();
+var_dump(file_exists($dbFile));
+unlink($dbFile);
+
+set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline) {
+    throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
+});
+
+clearstatcache();
+var_dump(file_exists($dbFile));
+
+try {
+    new PDO("uri:{$dsnFile}");
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+}
+
+clearstatcache();
+var_dump(file_exists($dbFile));
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite___construct_uri.dsn");
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite___construct_uri.db");
+?>
+--EXPECTF--
+bool(false)
+
+Deprecated: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs in %s on line %d
+bool(true)
+bool(false)
+ErrorException: Looking up the DSN from a URI is deprecated due to possible security concerns with DSNs coming from remote URIs
+bool(false)
diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php
index 67fb849db5845..7af884953bef3 100644
--- a/ext/reflection/php_reflection.stub.php
+++ b/ext/reflection/php_reflection.stub.php
@@ -226,6 +226,7 @@ public function getPrototype(): ReflectionMethod {}
     public function hasPrototype(): bool {}
 
     /** @tentative-return-type */
+    #[\Deprecated(since: '8.5', message: "as it has no effect")]
     public function setAccessible(bool $accessible): void {}
 }
 
@@ -542,6 +543,7 @@ public function getDeclaringClass(): ReflectionClass {}
     public function getDocComment(): string|false {}
 
     /** @tentative-return-type */
+    #[\Deprecated(since: '8.5', message: "as it has no effect")]
     public function setAccessible(bool $accessible): void {}
 
     /** @tentative-return-type */
diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h
index 85827cf502517..907ada13efab1 100644
--- a/ext/reflection/php_reflection_arginfo.h
+++ b/ext/reflection/php_reflection_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ef9e7f30a29819489e17a9c100f55696d5d164e0 */
+ * Stub hash: 0f6ecac0c6c4fb4af140a1be95f6a50c7532dae9 */
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
@@ -1076,7 +1076,7 @@ static const zend_function_entry class_ReflectionMethod_methods[] = {
 	ZEND_ME(ReflectionMethod, getDeclaringClass, arginfo_class_ReflectionMethod_getDeclaringClass, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionMethod, getPrototype, arginfo_class_ReflectionMethod_getPrototype, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionMethod, hasPrototype, arginfo_class_ReflectionMethod_hasPrototype, ZEND_ACC_PUBLIC)
-	ZEND_ME(ReflectionMethod, setAccessible, arginfo_class_ReflectionMethod_setAccessible, ZEND_ACC_PUBLIC)
+	ZEND_ME(ReflectionMethod, setAccessible, arginfo_class_ReflectionMethod_setAccessible, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
 	ZEND_FE_END
 };
 
@@ -1182,7 +1182,7 @@ static const zend_function_entry class_ReflectionProperty_methods[] = {
 	ZEND_ME(ReflectionProperty, getModifiers, arginfo_class_ReflectionProperty_getModifiers, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionProperty, getDeclaringClass, arginfo_class_ReflectionProperty_getDeclaringClass, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionProperty, getDocComment, arginfo_class_ReflectionProperty_getDocComment, ZEND_ACC_PUBLIC)
-	ZEND_ME(ReflectionProperty, setAccessible, arginfo_class_ReflectionProperty_setAccessible, ZEND_ACC_PUBLIC)
+	ZEND_ME(ReflectionProperty, setAccessible, arginfo_class_ReflectionProperty_setAccessible, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
 	ZEND_ME(ReflectionProperty, getType, arginfo_class_ReflectionProperty_getType, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionProperty, getSettableType, arginfo_class_ReflectionProperty_getSettableType, ZEND_ACC_PUBLIC)
 	ZEND_ME(ReflectionProperty, hasType, arginfo_class_ReflectionProperty_hasType, ZEND_ACC_PUBLIC)
@@ -1493,6 +1493,14 @@ static zend_class_entry *register_class_ReflectionMethod(zend_class_entry *class
 	ZVAL_UNDEF(&property_class_default_value);
 	zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_CLASS), &property_class_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING));
 
+
+	zend_attribute *attribute_Deprecated_func_setaccessible_0 = zend_add_function_attribute(zend_hash_str_find_ptr(&class_entry->function_table, "setaccessible", sizeof("setaccessible") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
+	ZVAL_STR(&attribute_Deprecated_func_setaccessible_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5));
+	attribute_Deprecated_func_setaccessible_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
+	zend_string *attribute_Deprecated_func_setaccessible_0_arg1_str = zend_string_init("as it has no effect", strlen("as it has no effect"), 1);
+	ZVAL_STR(&attribute_Deprecated_func_setaccessible_0->args[1].value, attribute_Deprecated_func_setaccessible_0_arg1_str);
+	attribute_Deprecated_func_setaccessible_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
+
 	return class_entry;
 }
 
@@ -1650,6 +1658,14 @@ static zend_class_entry *register_class_ReflectionProperty(zend_class_entry *cla
 	ZVAL_UNDEF(&property_class_default_value);
 	zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_CLASS), &property_class_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING));
 
+
+	zend_attribute *attribute_Deprecated_func_setaccessible_0 = zend_add_function_attribute(zend_hash_str_find_ptr(&class_entry->function_table, "setaccessible", sizeof("setaccessible") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
+	ZVAL_STR(&attribute_Deprecated_func_setaccessible_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5));
+	attribute_Deprecated_func_setaccessible_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
+	zend_string *attribute_Deprecated_func_setaccessible_0_arg1_str = zend_string_init("as it has no effect", strlen("as it has no effect"), 1);
+	ZVAL_STR(&attribute_Deprecated_func_setaccessible_0->args[1].value, attribute_Deprecated_func_setaccessible_0_arg1_str);
+	attribute_Deprecated_func_setaccessible_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
+
 	return class_entry;
 }
 
diff --git a/ext/reflection/tests/ReflectionMethod_setAccessible.phpt b/ext/reflection/tests/ReflectionMethod_setAccessible.phpt
index 92312528a0419..ba4864d28ed86 100644
--- a/ext/reflection/tests/ReflectionMethod_setAccessible.phpt
+++ b/ext/reflection/tests/ReflectionMethod_setAccessible.phpt
@@ -37,7 +37,7 @@ $protected->invokeArgs(new A, array(NULL));
 $protectedStatic->invoke(NULL, NULL);
 $protectedStatic->invokeArgs(NULL, array(NULL));
 ?>
---EXPECT--
+--EXPECTF--
 A::aPrivate
 A::aPrivate
 A::aPrivateStatic
@@ -46,6 +46,14 @@ A::aProtected
 A::aProtected
 A::aProtectedStatic
 A::aProtectedStatic
+
+Deprecated: Method ReflectionMethod::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionMethod::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionMethod::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionMethod::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
 A::aPrivate
 A::aPrivate
 A::aPrivateStatic
diff --git a/ext/reflection/tests/ReflectionProperty_setAccessible.phpt b/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
index 4e12af87916fa..b63ab38c15981 100644
--- a/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
+++ b/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
@@ -95,6 +95,14 @@ string(1) "e"
 string(1) "f"
 string(1) "g"
 string(1) "h"
+
+Deprecated: Method ReflectionProperty::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionProperty::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionProperty::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionProperty::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
 string(1) "e"
 string(1) "f"
 string(1) "g"
@@ -111,6 +119,12 @@ string(1) "c"
 string(1) "e"
 string(1) "f"
 string(1) "g"
+
+Deprecated: Method ReflectionProperty::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionProperty::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
+
+Deprecated: Method ReflectionProperty::setAccessible() is deprecated since 8.5, as it has no effect in %s on line %d
 string(1) "e"
 string(1) "f"
 string(1) "g"
diff --git a/ext/reflection/tests/bug79683.phpt b/ext/reflection/tests/bug79683.phpt
index 766571918afb6..4eeafb6bb9308 100644
--- a/ext/reflection/tests/bug79683.phpt
+++ b/ext/reflection/tests/bug79683.phpt
@@ -22,7 +22,6 @@ $b = new B();
 
 $reflector = new ReflectionClass($b);
 $property = $reflector->getProperty('prop2');
-$property->setAccessible(true);
 $property->setValue($b, new A());
 
 var_dump($b);
diff --git a/ext/reflection/tests/property_hooks/basics.phpt b/ext/reflection/tests/property_hooks/basics.phpt
index 8c363dcc4bfb0..6011018c64cfa 100644
--- a/ext/reflection/tests/property_hooks/basics.phpt
+++ b/ext/reflection/tests/property_hooks/basics.phpt
@@ -47,7 +47,6 @@ try {
 } catch (ReflectionException $e) {
     echo $e->getMessage(), "\n";
 }
-$s->setAccessible(true);
 $s->invoke($test, 42);
 var_dump($test->prop2);
 dumpFlags($rp2);
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 8c59e9624a332..049d850d12fc7 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -260,19 +260,16 @@ static zend_result spl_filesystem_object_get_file_name(spl_filesystem_object *in
 	return SUCCESS;
 } /* }}} */
 
-/* TODO Make void or have callers check return value */
-static bool spl_filesystem_dir_read(spl_filesystem_object *intern) /* {{{ */
+static void spl_filesystem_dir_read(spl_filesystem_object *intern) /* {{{ */
 {
 	if (intern->file_name) {
 		/* invalidate */
 		zend_string_release(intern->file_name);
 		intern->file_name = NULL;
 	}
+
 	if (!intern->u.dir.dirp || !php_stream_readdir(intern->u.dir.dirp, &intern->u.dir.entry)) {
 		intern->u.dir.entry.d_name[0] = '\0';
-		return 0;
-	} else {
-		return 1;
 	}
 }
 /* }}} */
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 2d4798a14db78..541415a5ab918 100644
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -3587,6 +3587,7 @@ function stream_set_timeout($stream, int $seconds, int $microseconds = 0): bool
  * @param resource $stream
  * @alias stream_set_timeout
  */
+#[\Deprecated(since: '8.5', message: "use stream_set_timeout() instead")]
 function socket_set_timeout($stream, int $seconds, int $microseconds = 0): bool {}
 #endif
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 49ad188a32275..ba9d1710137cc 100644
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: dcc4e6865dac52b23534b6ef61c0d6be766af6b9 */
+ * Stub hash: deb4ea96dd130d8a0174678095c30a61e118bd60 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -3431,7 +3431,7 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(stream_set_chunk_size, arginfo_stream_set_chunk_size)
 #if (defined(HAVE_SYS_TIME_H) || defined(PHP_WIN32))
 	ZEND_FE(stream_set_timeout, arginfo_stream_set_timeout)
-	ZEND_RAW_FENTRY("socket_set_timeout", zif_stream_set_timeout, arginfo_socket_set_timeout, 0, NULL, NULL)
+	ZEND_RAW_FENTRY("socket_set_timeout", zif_stream_set_timeout, arginfo_socket_set_timeout, ZEND_ACC_DEPRECATED, NULL, NULL)
 #endif
 	ZEND_RAW_FENTRY("gettype", zif_gettype, arginfo_gettype, ZEND_ACC_COMPILE_TIME_EVAL, NULL, NULL)
 	ZEND_RAW_FENTRY("get_debug_type", zif_get_debug_type, arginfo_get_debug_type, ZEND_ACC_COMPILE_TIME_EVAL, NULL, NULL)
@@ -3922,6 +3922,15 @@ static void register_basic_functions_symbols(int module_number)
 	zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "password_hash", sizeof("password_hash") - 1), 0, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);
 
 	zend_add_parameter_attribute(zend_hash_str_find_ptr(CG(function_table), "password_verify", sizeof("password_verify") - 1), 0, ZSTR_KNOWN(ZEND_STR_SENSITIVEPARAMETER), 0);
+#if (defined(HAVE_SYS_TIME_H) || defined(PHP_WIN32))
+
+	zend_attribute *attribute_Deprecated_func_socket_set_timeout_0 = zend_add_function_attribute(zend_hash_str_find_ptr(CG(function_table), "socket_set_timeout", sizeof("socket_set_timeout") - 1), ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
+	ZVAL_STR(&attribute_Deprecated_func_socket_set_timeout_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5));
+	attribute_Deprecated_func_socket_set_timeout_0->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
+	zend_string *attribute_Deprecated_func_socket_set_timeout_0_arg1_str = zend_string_init("use stream_set_timeout() instead", strlen("use stream_set_timeout() instead"), 1);
+	ZVAL_STR(&attribute_Deprecated_func_socket_set_timeout_0->args[1].value, attribute_Deprecated_func_socket_set_timeout_0_arg1_str);
+	attribute_Deprecated_func_socket_set_timeout_0->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);
+#endif
 
 	zend_attribute *attribute_Deprecated_const_ASSERT_ACTIVE_0 = zend_add_global_constant_attribute(const_ASSERT_ACTIVE, ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
 	ZVAL_STR(&attribute_Deprecated_const_ASSERT_ACTIVE_0->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_3));
diff --git a/ext/standard/tests/file/fread_socket_variation1.phpt b/ext/standard/tests/file/fread_socket_variation1.phpt
index 09b3d65393abd..62d4b33ba486d 100644
--- a/ext/standard/tests/file/fread_socket_variation1.phpt
+++ b/ext/standard/tests/file/fread_socket_variation1.phpt
@@ -12,7 +12,7 @@ for ($i=0; $i<100; $i++) {
   }
 }
 
-socket_set_timeout($server, 0, 1000);
+stream_set_timeout($server, 0, 1000);
 
 var_dump(fread($server, 1));
 
diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
index cd1ba6b41dd80..1ac08dd5c841d 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
@@ -18,7 +18,7 @@ $socket = stream_socket_accept($server);
 var_dump(stream_get_meta_data($client));
 
 echo "\n\nSet a timeout on the client and attempt a read:\n";
-socket_set_timeout($client, 0, 1000);
+stream_set_timeout($client, 0, 1000);
 fread($client, 1);
 var_dump(stream_get_meta_data($client));
 
diff --git a/ext/zend_test/tests/gh9871.phpt b/ext/zend_test/tests/gh9871.phpt
index b40a20a2609ec..d1a1be1a520bc 100644
--- a/ext/zend_test/tests/gh9871.phpt
+++ b/ext/zend_test/tests/gh9871.phpt
@@ -19,7 +19,7 @@ class A {
 }
 
 $property = new MyReflectionProperty('A', 'protected');
-$property->setAccessible(true);
+$property->isStatic();
 
 ?>
 --EXPECTF--
@@ -28,7 +28,7 @@ $property->setAccessible(true);
   <!-- init ReflectionProperty::__construct() -->
   <ReflectionProperty::__construct>
   </ReflectionProperty::__construct:NULL>
-  <!-- init ReflectionProperty::setAccessible() -->
-  <ReflectionProperty::setAccessible>
-  </ReflectionProperty::setAccessible:NULL>
+  <!-- init ReflectionProperty::isStatic() -->
+  <ReflectionProperty::isStatic>
+  </ReflectionProperty::isStatic:false>
 </file '%s'>
diff --git a/run-tests.php b/run-tests.php
index 036162725673f..6c31c1d0187d9 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -688,6 +688,10 @@ function main(): void
     // Run selected tests.
     $test_cnt = count($test_files);
 
+    if ($test_cnt === 1) {
+        $cfg['show']['diff'] = true;
+    }
+
     verify_config($php);
     write_information($user_tests, $phpdbg);