Merge branch 'master' into debuginfo-return-null-deprecate

Author: TimWolla

CONTRIBUTING.md

@@ -91,7 +91,7 @@ repository. Mailing list subscription is explained on the
 [mailing lists page](https://www.php.net/mailing-lists.php).
 
 You may also want to read
-[The Mysterious PHP RFC Process](https://blogs.oracle.com/opal/post/the-mysterious-php-rfc-process-and-how-you-can-change-the-web)
+[The Mysterious PHP RFC Process](https://web.archive.org/web/20210621140006/https://blogs.oracle.com/opal/the-mysterious-php-rfc-process-and-how-you-can-change-the-web)
 for additional notes on the best way to approach submitting an RFC.
 
 ## Technical resources

NEWS

@@ -51,6 +51,8 @@ PHP                                                                        NEWS
   . gmp_fact() reject values larger than unsigned long. (David Carlier)
   . gmp_pow/binomial/root/rootrem and shift/pow operators reject values
     larger than unsigned long. (David Carlier)
+  . GMP exponentiation and shift operators now emit a deprecation warning
+    when converting a float right operand to int loses precision. (Weilin Du)
 
 - Hash:
   . Upgrade xxHash to 0.8.2. (timwolla)
@@ -62,6 +64,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-20426 (Spoofchecker::setRestrictionLevel() error message
     suggests missing constants). (DanielEScherzer)
   . Added grapheme_strrev (Yuya Hamada)
+  . Passing a non-stringable object as a time zone to Intl time zone
+    argument handling now raises TypeError instead of Error. (Weilin Du)
+  . IntlBreakIterator::getLocale() now raises ValueError for invalid locale
+    types. (Weilin Du)
 
 - JSON:
   . Enriched JSON last error / exception message with error location.

UPGRADING

@@ -34,6 +34,13 @@ PHP 8.6 UPGRADE NOTES
     array arguments types/values and raise a TypeError/ValueError
     accordingly.
 
+- Intl:
+  . Passing a non-stringable object as a time zone to Intl APIs that accept
+    time zone objects or strings now raises a TypeError instead of an Error.
+  . IntlBreakIterator::getLocale() now raises a ValueError when the type is
+    neither Locale::ACTUAL_LOCALE nor Locale::VALID_LOCALE instead of
+    returning false.
+
 - PCNTL:
   . pcntl_alarm() now raises a ValueError if the seconds argument is
     lower than zero or greater than platform's UINT_MAX.
@@ -129,6 +136,8 @@ PHP 8.6 UPGRADE NOTES
 - Core:
   . It is now possible to use reference assign on WeakMap without the key
     needing to be present beforehand.
+  . It is now possible to define the `__debugInfo()` magic method on enums.
+    RFC: https://wiki.php.net/rfc/debugable-enums
 
 - Fileinfo:
   . finfo_file() now works with remote streams.
@@ -180,6 +189,11 @@ PHP 8.6 UPGRADE NOTES
 4. Deprecated Functionality
 ========================================
 
+- GMP
+  . The shift (<<, >>) and exponentiation (**) operators on GMP objects now
+    emit a deprecation warning when converting a float right operand to int
+    loses precision.
+
 - Mbstring:
   . Mbregex has been deprecated, because the underlying Oniguruma library
     is no longer maintained.

UPGRADING.INTERNALS

@@ -103,6 +103,10 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . The deprecated Z_IMMUTABLE(), Z_IMMUTABLE_P(), Z_OPT_IMMUTABLE(), and
     Z_OPT_IMMUTABLE_P() macros have been removed. Check for
     IS_ARRAY && !REFCOUNTED directly.
+  . Added zend_fcall_info.consumed_args together with
+    zend_fci_consumed_arg(), which allows moving a selected callback argument
+    instead of copying it in zend_call_function(). Currently only a single
+    consumed argument is supported.
 
 ========================
 2. Build system changes

Zend/asm/save_xmm_x86_64_ms_masm.asm

@@ -9,34 +9,34 @@ EXTERN execute_ex_real:PROC
 ; save the preserved registers when re-entering the VM from JIT code.
 ; See GH-18136.
 execute_ex PROC EXPORT FRAME
-    ; 10 floating points numbers
+    ; 10 XMM registers
     ; 32 bytes shadow space
     ; 8 bytes to align after the return address
-    sub rsp, 8*10 + 32 + 8
-    .allocstack 8*10 + 32 + 8
+    sub rsp, 16*10 + 32 + 8
+    .allocstack 16*10 + 32 + 8
     .endprolog
-    movsd qword ptr [rsp + 32 + 8*0], xmm6
-    movsd qword ptr [rsp + 32 + 8*1], xmm7
-    movsd qword ptr [rsp + 32 + 8*2], xmm8
-    movsd qword ptr [rsp + 32 + 8*3], xmm9
-    movsd qword ptr [rsp + 32 + 8*4], xmm10
-    movsd qword ptr [rsp + 32 + 8*5], xmm11
-    movsd qword ptr [rsp + 32 + 8*6], xmm12
-    movsd qword ptr [rsp + 32 + 8*7], xmm13
-    movsd qword ptr [rsp + 32 + 8*8], xmm14
-    movsd qword ptr [rsp + 32 + 8*9], xmm15
+    movaps xmmword ptr [rsp + 32 + 16*0], xmm6
+    movaps xmmword ptr [rsp + 32 + 16*1], xmm7
+    movaps xmmword ptr [rsp + 32 + 16*2], xmm8
+    movaps xmmword ptr [rsp + 32 + 16*3], xmm9
+    movaps xmmword ptr [rsp + 32 + 16*4], xmm10
+    movaps xmmword ptr [rsp + 32 + 16*5], xmm11
+    movaps xmmword ptr [rsp + 32 + 16*6], xmm12
+    movaps xmmword ptr [rsp + 32 + 16*7], xmm13
+    movaps xmmword ptr [rsp + 32 + 16*8], xmm14
+    movaps xmmword ptr [rsp + 32 + 16*9], xmm15
     call execute_ex_real
-    movsd xmm6, qword ptr [rsp + 32 + 8*0]
-    movsd xmm7, qword ptr [rsp + 32 + 8*1]
-    movsd xmm8, qword ptr [rsp + 32 + 8*2]
-    movsd xmm9, qword ptr [rsp + 32 + 8*3]
-    movsd xmm10, qword ptr [rsp + 32 + 8*4]
-    movsd xmm11, qword ptr [rsp + 32 + 8*5]
-    movsd xmm12, qword ptr [rsp + 32 + 8*6]
-    movsd xmm13, qword ptr [rsp + 32 + 8*7]
-    movsd xmm14, qword ptr [rsp + 32 + 8*8]
-    movsd xmm15, qword ptr [rsp + 32 + 8*9]
-    add rsp, 8*10 + 32 + 8
+    movaps xmm6, xmmword ptr [rsp + 32 + 16*0]
+    movaps xmm7, xmmword ptr [rsp + 32 + 16*1]
+    movaps xmm8, xmmword ptr [rsp + 32 + 16*2]
+    movaps xmm9, xmmword ptr [rsp + 32 + 16*3]
+    movaps xmm10, xmmword ptr [rsp + 32 + 16*4]
+    movaps xmm11, xmmword ptr [rsp + 32 + 16*5]
+    movaps xmm12, xmmword ptr [rsp + 32 + 16*6]
+    movaps xmm13, xmmword ptr [rsp + 32 + 16*7]
+    movaps xmm14, xmmword ptr [rsp + 32 + 16*8]
+    movaps xmm15, xmmword ptr [rsp + 32 + 16*9]
+    add rsp, 16*10 + 32 + 8
     ret
 execute_ex ENDP
 

Zend/tests/GHSA-wm6j-2649-pv75.phpt

@@ -0,0 +1,24 @@
+--TEST--
+GHSA-wm6j-2649-pv75: Null pointer dereference in php_mb_check_encoding() via mb_ereg_search_init()
+--CREDITS--
+vi3tL0u1s
+--EXTENSIONS--
+mbstring
+--SKIPIF--
+<?php
+if (!function_exists('mb_regex_encoding')) die('skip No mbregex support');
+?>
+--FILE--
+<?php
+// iso-8859-11 is supported by Oniguruma but not by mbfl
+mb_regex_encoding('iso-8859-11');
+mb_ereg_search_init('x');
+?>
+--EXPECTF--
+Deprecated: Function mb_regex_encoding() is deprecated since 8.6, because the underlying library is no longer maintained in %s on line %d
+
+Fatal error: Uncaught ValueError: mb_regex_encoding(): Argument #1 ($encoding) must be a valid encoding, "iso-8859-11" given in %s:%d
+Stack trace:
+#0 %s(%d): mb_regex_encoding('iso-8859-11')
+#1 {main}
+  thrown in %s on line %d

Zend/tests/enum/__debugInfo.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Enum with __debugInfo() magic method - backed enum value accessible
+--FILE--
+<?php
+
+enum Foo: string {
+	case Bar = "Baz";
+
+	public function __debugInfo() {
+		return [__CLASS__ . '::' . $this->name . ' = ' . $this->value];
+	}
+}
+
+var_dump(Foo::Bar);
+
+?>
+--EXPECT--
+enum(Foo::Bar) (1) {
+  [0]=>
+  string(14) "Foo::Bar = Baz"
+}

Zend/tests/enum/debugInfo/backed_enum_value.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Enum supports __debugInfo() magic method
+--FILE--
+<?php
+
+enum Foo {
+	case Bar;
+
+	public function __debugInfo() {
+		return [$this->name . ' is a case of the ' . __CLASS__ . ' enum'];
+	}
+}
+
+var_dump(Foo::Bar);
+
+?>
+--EXPECT--
+enum(Foo::Bar) (1) {
+  [0]=>
+  string(29) "Bar is a case of the Foo enum"
+}

Zend/tests/enum/debugInfo/magic_method.phpt

@@ -0,0 +1,14 @@
+--TEST--
+When an enum does not have __debugInfo() it is printed nicely
+--FILE--
+<?php
+
+enum Foo {
+	case Bar;
+}
+
+var_dump(Foo::Bar);
+
+?>
+--EXPECT--
+enum(Foo::Bar)