Merge branch 'master' into uri-construct-leak-modify

Author: TimWolla

.github/workflows/nightly.yml

@@ -44,6 +44,9 @@ on:
       skip_wordpress:
         required: true
         type: boolean
+      variation_enable_zend_max_execution_timers:
+        required: true
+        type: boolean
 permissions:
   contents: read
 jobs:
@@ -198,6 +201,7 @@ jobs:
             zts: true
             configuration_parameters: >-
               CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE"
+              ${{ inputs.variation_enable_zend_max_execution_timers && '--enable-zend-max-execution-timers' || '' }}
             run_tests_parameters: -d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0
             timeout_minutes: 360
             test_function_jit: true

.github/workflows/root.yml

@@ -64,4 +64,5 @@ jobs:
       skip_laravel: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
       skip_symfony: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
       skip_wordpress: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
+      variation_enable_zend_max_execution_timers: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9 }}
     secrets: inherit

NEWS

@@ -2,6 +2,23 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.0RC1
 
+- Core:
+  . Fixed bug GH-19765 (object_properties_load() bypasses readonly property
+    checks). (timwolla)
+  . The __sleep() and __wakeup() magic methods have been deprecated. (Girgias)
+  . Fixed hard_timeout with --enable-zend-max-execution-timers. (Appla)
+
+- Opcache:
+  . Fixed bug GH-19669 (assertion failure in zend_jit_trace_type_to_info_ex).
+    (Arnaud)
+
+- URI:
+  . Fixed bug GH-19780 (InvalidUrlException should check $errors argument).
+    (nielsdos)
+
+- Windows:
+  . Fix GH-19722 (_get_osfhandle asserts in debug mode when given a socket).
+    (dktapps)
 
 11 Sep 2025, PHP 8.5.0beta3
 

UPGRADING

@@ -392,6 +392,10 @@ PHP 8.5 UPGRADE NOTES
     $_GET or $_SERVER['QUERY_STRING'] to access the information, after verifying
     that the usage is safe.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_register_argc_argv_ini_directive
+  . The __sleep() and __wakeup() magic methods have been deprecated. The
+    __serialize() and __unserialize() magic methods should be used instead,
+    or at the same time if compatibility with PHP 7 is required.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_sleep_and_wakeup_magic_methods
 
 - Curl:
   . The curl_close() function has been deprecated, as CurlHandle objects are

Zend/Optimizer/sccp.c

@@ -838,9 +838,7 @@ static inline zend_result ct_eval_func_call_ex(
 		zval_ptr_dtor(result);
 		zend_clear_exception();
 		retval = FAILURE;
-	}
-
-	if (EG(capture_warnings_during_sccp) > 1) {
+	} else if (EG(capture_warnings_during_sccp) > 1) {
 		zval_ptr_dtor(result);
 		retval = FAILURE;
 	}

Zend/tests/enum/__sleep.phpt

@@ -13,4 +13,6 @@ enum Foo {
 
 ?>
 --EXPECTF--
+Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
+
 Fatal error: Enum Foo cannot include magic method __sleep in %s on line %d

Zend/tests/enum/__wakeup.phpt

@@ -13,4 +13,6 @@ enum Foo {
 
 ?>
 --EXPECTF--
+Deprecated: The __wakeup() serialization magic method has been deprecated. Implement __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
+
 Fatal error: Enum Foo cannot include magic method __wakeup in %s on line %d

Zend/tests/lazy_objects/oss_fuzz_71446.phpt

@@ -20,3 +20,4 @@ $obj = $reflector->newLazyProxy(function() {
 serialize($obj);
 ?>
 --EXPECTF--
+Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d

Zend/tests/lazy_objects/serialize___sleep.phpt

@@ -36,6 +36,7 @@ try {
 
 ?>
 --EXPECTF--
+Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
 Init on serialize and successful initialization
 string(27) "O:1:"C":1:{s:4:"%0C%0b";i:1;}"
 Init on serialize and failed initialization

Zend/tests/lazy_objects/serialize___sleep_initializes.phpt

@@ -37,6 +37,7 @@ $obj = $reflector->newLazyProxy(function ($obj) {
 test('Proxy', $obj);
 
 --EXPECTF--
+Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
 # Ghost:
 string(11) "initializer"
 string(24) "O:1:"C":1:{s:1:"a";i:1;}"