Girgias · Girgias · Aug 17, 2020 · Aug 17, 2020 · Jul 8, 2020 · Aug 17, 2020
diff --git a/NEWS b/NEWS
@@ -1,7 +1,23 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.0.0beta2
+?? ??? ????, PHP 8.0.0beta3
 
+- Calendar:
+  . Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).
+    (Andy Postnikov)
+
+- COM:
+  . Fixed bug #55847 (DOTNET .NET 4.0 GAC new location). (cmb)
+
+- DOM:
+  . Fixed bug #79968 (DOMChildNode API crash on unattached nodes). (Benjamin)
+
+
+20 Aug 2020, PHP 8.0.0beta2
+
+- SPL:
+  . Fixed bug #79987 (Memory leak in SplFileInfo because of missing
+    zend_restore_error_handling()). (Dmitry)
 
 06 Aug 2020, PHP 8.0.0beta1
 

diff --git a/UPGRADING b/UPGRADING
@@ -21,6 +21,7 @@ PHP 8.0 UPGRADE NOTES
 ========================================
 
 - Core:
+  . `match` is now a reserved keyword.
   . Assertion failures now throw by default. If the old behavior is desired,
     then set `assert.exception=0` in INI settings.
   . Methods with the same name as the class are no longer interpreted as
@@ -148,7 +149,7 @@ PHP 8.0 UPGRADE NOTES
         new class {};
         // -> class@anonymous
 
-    The name shown above is still followed by a null byte and and a unique
+    The name shown above is still followed by a null byte and a unique
     suffix.
   . Non-absolute trait method references in trait alias adaptations are now
     required to be unambiguous:
@@ -380,6 +381,9 @@ PHP 8.0 UPGRADE NOTES
     removed.
 
 - OCI8:
+  . The OCI-Lob class is now called OCILob, and the OCI-Collection class is now
+    called OCICollection for name compliance enforced by PHP 8 arginfo
+    type annotation tooling.
   . Several alias functions have been marked as deprecated.
   . oci_internal_debug() and its alias ociinternaldebug() have been removed.
 
@@ -1044,6 +1048,10 @@ PHP 8.0 UPGRADE NOTES
   . New INI directive to set the maximum string length in an argument of a
     stringified stack strace.
 
+- com.dotnet_version
+  . New INI directive to choose the version of the .NET framework to use for
+    dotnet objects.
+
 ========================================
 12. Windows Support
 ========================================

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
@@ -22,6 +22,7 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   s. zend_fcall_info no_separation flag removed
   t. Signature changes
   u. Error Notification callbacks to replace zend_error_cb overwrite use-cases
+  v. Removed Zend APIs
 
 2. Build system changes
   a. Abstract
@@ -157,6 +158,28 @@ PHP 8.0 INTERNALS UPGRADE NOTES
         - zend_fcall_info_argp()
         - zend_fcall_info_argv()
         - zend_fcall_info_argn()
+        - zend_startup()
+        - zend_set_memory_limit()
+        - pass_two()
+        - zend_startup_constants()
+        - zend_shutdown_constants()
+        - zend_startup_extensions_mechanism()
+        - zend_startup_extensions()
+        - zend_register_extension()
+        - highlight_string()
+        - zend_ini_startup()
+        - zend_ini_shutdown()
+        - zend_ini_global_shutdown()
+        - zend_ini_deactivate()
+        - zend_copy_ini_directives()
+        - zend_prepare_string_for_scanning()
+        - zend_init_rsrc_list()
+        - zend_list_close()
+        - zend_signal()
+        - zend_sigaction()
+        - zend_stack_init()
+        - zend_stack_del_top()
+        - zend_stack_destroy()
      2. Argument int to uint32_t in Zend Engine 4.0:
         - _zend_get_parameters_array_ex()
         - zend_copy_parameters_array()
@@ -168,8 +191,39 @@ PHP 8.0 INTERNALS UPGRADE NOTES
         - zend_wrong_parameter*()
         - zend_wrong_callback_error()
         - zend_parse_arg_class()
-     3. Argument int to zend_bool in Zend Engine 4.0:
+     3. Argument int to bool in Zend Engine 4.0:
         - add_next_index_bool()
+        - zend_register_class_alias_ex()
+        - add_assoc_bool_ex()
+        - add_index_bool()
+        - zend_fcall_info_args_clear()
+        - zend_set_local_var()
+        - zend_set_local_var_str()
+        - zend_parse_arg_*()
+        - shutdown_memory_manager()
+        - zend_memory_usage()
+        - zend_memory_peak_usage()
+        - zend_mm_shutdown()
+        - zend_eval_string*()
+        - zend_set_timeout()
+        - _zend_hash_append_ex()
+        - _zend_hash_append_ptr_ex()
+        - zend_alter_ini_entry_ex()
+        - (*zend_encoding_list_parser) typedef
+        - zend_multibyte_parse_encoding_list()
+        - zend_safe_address()
+        - zend_string_tolower_ex()
+        - zend_string_alloc()
+        - zend_string_safe_alloc()
+        - zend_string_init()
+        - zend_string_dup()
+        - zend_string_realloc()
+        - zend_string_extend()
+        - zend_string_truncate()
+        - zend_string_safe_realloc()
+        - zend_string_release_ex()
+        - zend_ts_hash_merge()
+        - zend_ts_hash_sort()
      4. Argument int to size_t in Zend Engine 4.0:
         - zend_set_hash_symbol()
      5. Argument zval* to zend_object* in Zend Engine 4.0:
@@ -184,6 +238,135 @@ PHP 8.0 INTERNALS UPGRADE NOTES
         - zend_get_exception_base()
      6. Argument zval* to zend_long in Zend Engine 4.0:
         - _php_math_longtobase()
+     7. Return type from int to zend_result in Zend Engine 4.0:
+        - (*stream_open_function) in _zend_utility_functions
+        - (*zend_post_startup_cb)
+        - (*zend_preload_autoload)
+        - zend_execute_scripts()
+        - zend_post_startup()
+        - _zend_get_parameters_array_ex()
+        - zend_copy_parameters_array()
+        - zend_parse_parameters()
+        - zend_parse_parameters_ex()
+        - zend_parse_method_parameters()
+        - zend_parse_method_parameters_ex()
+        - zend_parse_method_parameters()
+        - zend_register_functions()
+        - zend_startup_module()
+        - zend_startup_module_ex()
+        - zend_register_class_alias_ex()
+        - zend_disable_function()
+        - zend_disable_class()
+        - zend_update_class_constants()
+        - zend_update_static_property*()
+        - object_init_ex()
+        - object_and_properties_init()
+        - add_index_zval()
+        - add_next_index_long_*()
+        - array_set_zval_key()
+        - _call_user_function_impl()
+        - zend_fcall_info_*()
+        - zend_call_function()
+        - zend_set_hash_symbol()
+        - zend_delete_global_variable()
+        - zend_set_local_var()
+        - zend_set_local_var_str()
+        - zend_forbid_dynamic_call()
+        - zend_get_default_from_internal_arg_info()
+        - zend_try_assign_typed_ref*()
+        - zend_ast_evaluate()
+        - zend_startup_builtin_functions()
+        - do_bind_function()
+        - do_bind_class()
+        - zend_unmangle_property_name_ex()
+        - zend_register_auto_global()
+        - zend_register_constant()
+        - zend_exception_error()
+        - zend_eval_string*()
+        - zend_undefined_offset_write()
+        - zend_undefined_index_write()
+        - zval_update_constant(_ex)()
+        - zend_load_extension()
+        - zend_load_extension_handle()
+        - zend_hash_del(_ind)()
+        - zend_hash_str_del(_ind)()
+        - zend_hash_index_del()
+        - zend_hash_move_forward_ex()
+        - zend_hash_move_backward_ex()
+        - zend_hash_get_current_key_ex()
+        - zend_hash_get_current_key_type_ex()
+        - zend_symtable_del(_ind)()
+        - zend_symtable_str_del(_ind)()
+        - highlight_file()
+        - zend_do_link_class()
+        - zend_alter_ini_entry*()
+        - zend_restore_ini_entry()
+        - zend_ini_register_displayer()
+        - zend_ini_open_file_for_scanning()
+        - zend_ini_prepare_string_for_scanning()
+        - zend_user_it_valid()
+        - zend_create_internal_iterator_zval()
+        - zend_multibyte_set_filter()
+        - zend_lex_tstring()
+        - _zend_module_entry module_startup_func, module_shutdown_func,
+          request_startup_func, and request_shutdown_func function pointers
+        - (*zend_encoding_list_parser) typedef
+        - (*zend_encoding_internal_encoding_setter) typedef
+        - zend_multibyte_set_functions()
+        - zend_multibyte_set_script_encoding_by_string()
+        - add_function()
+        - sub_function()
+        - mul_function()
+        - pow_function()
+        - div_function()
+        - mod_function()
+        - boolean_xor_function()
+        - boolean_not_function()
+        - bitwise_not_function()
+        - bitwise_or_function()
+        - bitwise_and_function()
+        - bitwise_xor_function()
+        - shift_left_function()
+        - shift_right_function()
+        - concat_function()
+        - is_equal_function(
+        - is_identical_function()
+        - is_not_identical_function()
+        - is_not_equal_function()
+        - is_smaller_function()
+        - is_smaller_or_equal_function(zv
+        - increment_function()
+        - decrement_function()
+        - zend_stream_open()
+        - zend_stream_fixup()
+        - zend_ts_hash_del()
+        - zend_ts_hash_index_del()
+     8. Return type from int to bool in Zend Engine 4.0:
+        - zend_make_printable_zval()
+        - zend_parse_arg_*()
+        - is_zend_mm()
+        - is_zend_ptr()
+        - zend_mm_is_custom_heap()
+        - (*zend_mm_chunk_truncate_t)
+        - (*zend_mm_chunk_extend_t)
+        - zend_bitset_empty()
+        - zend_is_smart_branch()
+        - zend_check_arg_send_type()
+        - zend_verify_const_access()
+        - zend_gdb_register_code()
+        - zend_gdb_present()
+        - _zend_handle_numeric_str(_ex)()
+        - zend_hash_exists_ind()
+        - zend_hash_str_exists_ind()
+        - zend_symtable_exists(_ind)()
+        - zend_symtable_str_exists()
+        - (*zend_encoding_lexer_compatibility_checker)
+        - zend_object_is_true()
+        - i_zend_is_true()
+        - zendi_smart_streq()
+        - zend_stack_is_empty()
+        - zend_ts_hash_exists()
+        - zend_ts_hash_index_exists()
 
   u. Instead of overwriting zend_error_cb extensions with debugging, monitoring
      use-cases catching Errors/Exceptions are strongly encouraged to use
@@ -201,6 +384,17 @@ PHP 8.0 INTERNALS UPGRADE NOTES
 		}
 		zend_register_error_notify_callback(my_error_notify_cb);
 
+  v. The following APIs have been removed from the Zend Engine:
+     - zend_ts_hash_init_ex(), drop the last argument and use zend_ts_hash_init() instead
+     - zend_hash_init_ex(), drop the last argument and use zend_hash_init() instead
+     - zval_internal_dtor(), use zval_internal_ptr_dtor() instead
+     - zval_dtor_func(), use rc_dtor_func() instead
+     - zval_ptr_dtor_wrapper(), use zval_ptr_dtor() instead
+     - zval_internal_ptr_dtor_wrapper(), use zval_internal_ptr_dtor() instead
+
+  w. The following APIs have been renamed:
+     - _zend_ts_hash_init() to zend_ts_hash_init()
+
 ========================
 2. Build system changes
 ========================

diff --git a/Zend/tests/bug79979.phpt b/Zend/tests/bug79979.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #79979 (passing value to by-ref param via CUF(A) crashes)
+--FILE--
+<?php
+
+namespace Foo;
+
+call_user_func_array("str_replace", ["a", "b", "c", new \stdClass]);
+call_user_func_array("str_replace", ["a", "b", "c", "replace_count" => new \stdClass]);
+
+\call_user_func_array("str_replace", ["a", "b", "c", new \stdClass]);
+\call_user_func_array("str_replace", ["a", "b", "c", "replace_count" => new \stdClass]);
+
+?>
+--EXPECTF--
+Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
+
+Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
+
+Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
+
+Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
diff --git a/Zend/tests/exception_during_by_reference_magic_get.phpt b/Zend/tests/exception_during_by_reference_magic_get.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Exception thrown by __get() during =& assignment
+--FILE--
+<?php
+
+class Test {
+    private $x;
+    public function &__get($name) {
+        throw new Exception("Foobar");
+    }
+}
+
+$test = new Test;
+$y = 5;
+try {
+    $test->x =& $y;
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Foobar
diff --git a/Zend/tests/generators/yield_from_non_iterable.phpt b/Zend/tests/generators/yield_from_non_iterable.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Yield from non-iterable
+--FILE--
+<?php
+
+function gen() {
+    yield from new stdClass;
+}
+
+try {
+    gen()->current();
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Can use "yield from" only with arrays and Traversables
diff --git a/Zend/tests/named_params/cannot_pass_by_ref.phpt b/Zend/tests/named_params/cannot_pass_by_ref.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Cannot pass by reference error with named parameters
+--FILE--
+<?php
+function test($a, &$e) {}
+try {
+    test(e: 42);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Cannot pass parameter 2 by reference
diff --git a/Zend/tests/named_params/undef_var.phpt b/Zend/tests/named_params/undef_var.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Passing undefined variabled to named arg
+--FILE--
+<?php
+
+function func1($arg) { var_dump($arg); }
+func1(arg: $undef);
+func2(arg: $undef);
+function func2($arg) { var_dump($arg); }
+
+?>
+--EXPECTF--
+Warning: Undefined variable $undef in %s on line %d
+NULL
+
+Warning: Undefined variable $undef in %s on line %d
+NULL