[pull] master from php:master

NEWS

@@ -53,6 +53,9 @@ PHP                                                                        NEWS
     evaluation) and GH-18464 (Recursion protection for deprecation constants not
     released on bailout). (DanielEScherzer and ilutov)
   . Fixed AST printing for immediately invoked Closure. (Dmitrii Derepko)
+  . Properly handle __debugInfo() returning an array reference. (nielsdos)
+  . Properly handle reference return value from __toString(). (nielsdos)
+  . Added the pipe (|>) operator. (crell)
 
 - Curl:
   . Added curl_multi_get_handles(). (timwolla)
@@ -137,11 +140,14 @@ PHP                                                                        NEWS
   . Implement GH-15387 Pdo\Pgsql::setAttribute(PDO::ATTR_PREFETCH, 0) or
     Pdo\Pgsql::prepare(…, [ PDO::ATTR_PREFETCH => 0 ]) make fetch() lazy
     instead of storing the whole result set in memory (Guillaume Outters)
-  . Removed unused constants Pdo\Pgsql::TRANSACTION_* (vrana).
 
 - PDO_SQLITE:
   . throw on null bytes / resolve GH-13952 (divinity76).
   . Implement GH-17321: Add setAuthorizer to Pdo\Sqlite. (nielsdos)
+  . PDO::sqliteCreateCollation now throws a TypeError if the callback
+    has a wrong return type. (David Carlier)
+  . Added Pdo_Sqlite::ATTR_BUSY_STATEMENT constant to check
+    if a statement is currently executing. (David Carlier)
 
 - PGSQL:
   . Added pg_close_stmt to close a prepared statement while allowing

UPGRADING

@@ -101,9 +101,6 @@ PHP 8.5 UPGRADE NOTES
   . A ValueError is now thrown when trying to set a cursor name that is too
     long on a PDOStatement resulting from the Firebird driver.
 
-- PDO_PGSQL:
-  . Removed unused constants Pdo\Pgsql::TRANSACTION_*.
-
 - Session:
   . Attempting to write session data where $_SESSION has a key containing
     the pipe character will now emit a warning instead of silently failing.
@@ -147,6 +144,8 @@ PHP 8.5 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/attributes-on-constants
   . The #[\Deprecated] attribute can now be used on constants.
     RFC: https://wiki.php.net/rfc/attributes-on-constants
+  . Added the pipe (|>) operator.
+    RFC: https://wiki.php.net/rfc/pipe-operator-v3
 
 - Curl:
   . Added support for share handles that are persisted across multiple PHP
@@ -197,6 +196,9 @@ PHP 8.5 UPGRADE NOTES
     IntlListFormatter::WIDTH_NARROW widths.
     It is supported from icu 67.
 
+- PDO_Sqlite:
+  . Added class constant Pdo_Sqlite::ATTR_BUSY_STATEMENT.
+
 - SOAP:
   . Enumeration cases are now dumped in __getTypes().
 
@@ -271,6 +273,9 @@ PHP 8.5 UPGRADE NOTES
 - PDO_SQLITE:
   . SQLite PDO::quote() will now throw an exception or emit a warning,
     depending on the error mode, if the string contains a null byte.
+  . PDO::sqliteCreateCollation will now throw an exception
+    if the callback has the wrong return type, making it more
+    in line with Pdo_Sqlite::createCollation behavior.
 
 - PGSQL:
   . pg_copy_from also supports inputs as Iterable.
@@ -424,6 +429,9 @@ PHP 8.5 UPGRADE NOTES
 - PCRE:
   . Upgraded to pcre2lib from 10.44 to 10.45.
 
+- PDO_Sqlite:
+  . Increased minimum release version support from 3.7.7 to 3.7.17.
+
 - Readline:
   . The return types of readline_add_history(), readline_clear_history(), and
     readline_callback_handler_install() have been changed to true, rather
@@ -468,6 +476,10 @@ PHP 8.5 UPGRADE NOTES
   - SHUT_WR.
   - SHUT_RDWR.
 
+- Tokenizer:
+  . T_VOID_CAST.
+  . T_PIPE.
+
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -555,7 +567,7 @@ PHP 8.5 UPGRADE NOTES
   . Now avoids creating extra string copies when converting strings
     for use in the collator.
 
-MBString:
+- MBString:
   . The parts of the code that used SSE2 have been adapted to use SIMD
     with ARM NEON as well.
 
@@ -570,6 +582,8 @@ MBString:
   . Improved performance of array functions with callbacks
     (array_find, array_filter, array_map, usort, ...).
   . Improved performance of urlencode() and rawurlencode().
+  . Improved unpack() performance with nameless repetitions by avoiding
+    creating temporary strings and reparsing them.
 
 - XMLReader:
   . Improved property access performance.

UPGRADING.INTERNALS

@@ -34,6 +34,9 @@ PHP 8.5 INTERNALS UPGRADE NOTES
   . Added ZEND_NONSTRING attribute macro for character arrays that do not
     represent strings. This allows to silence the GCC 15.x
     `-Wunterminated-string-initialization` warning.
+  . Added the zend_update_exception_properties() function for instantiating
+    Exception child classes. It updates the $message, $code, and $previous
+    properties.
 
 ========================
 2. Build system changes

Zend/tests/__debugInfo_reference.phpt

@@ -0,0 +1,22 @@
+--TEST--
+__debugInfo with reference return
+--FILE--
+<?php
+
+class Test {
+    private $tmp = ['x' => 1];
+
+    public function &__debugInfo(): array
+    {
+        return $this->tmp;
+    }
+}
+
+var_dump(new Test);
+
+?>
+--EXPECT--
+object(Test)#1 (1) {
+  ["x"]=>
+  int(1)
+}

Zend/tests/exceptions/exception_fatal_uncaught_error_reference_tostring.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Exception fatal uncaught error with reference __toString
+--FILE--
+<?php
+
+class MyException extends Exception {
+    private $field = 'my string';
+    public function &__toString(): string {
+        return $this->field;
+    }
+}
+
+// Must not be caught to trigger the issue!
+throw new MyException;
+
+?>
+--EXPECTF--
+Fatal error: Uncaught my string
+  thrown in %s on line %d

Zend/tests/gh18756.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug GH-18756: Zend MM may delete the main chunk
+--EXTENSIONS--
+zend_test
+--FILE--
+<?php
+
+zend_test_gh18756();
+
+?>
+==DONE==
+--EXPECT--
+==DONE==

Zend/tests/pipe_operator/ast.phpt

@@ -0,0 +1,109 @@
+--TEST--
+A pipe operator displays as a pipe operator when outputting syntax, with correct parens.
+--FILE--
+<?php
+
+print "Concat, which binds higher\n";
+
+try {
+    assert(false && foo() . bar() |> baz() . quux());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && (foo() . bar()) |> baz() . quux());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && foo() . (bar() |> baz()) . quux());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && foo() . bar() |> (baz() . quux()));
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && (foo() . bar() |> baz()) . quux());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && foo() . (bar() |> baz() . quux()));
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+print "<, which binds lower\n";
+
+try {
+    assert(false && foo() < bar() |> baz());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && (foo() < bar()) |> baz());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && foo() < (bar() |> baz()));
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && foo() |> bar() < baz());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && (foo() |> bar()) < baz());
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    assert(false && foo() |> (bar() < baz()));
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+
+
+print "misc examples\n";
+
+try {
+    assert(false && foo() |> (bar() |> baz(...)));
+} catch (AssertionError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+Concat, which binds higher
+assert(false && foo() . bar() |> baz() . quux())
+assert(false && foo() . bar() |> baz() . quux())
+assert(false && foo() . (bar() |> baz()) . quux())
+assert(false && foo() . bar() |> baz() . quux())
+assert(false && (foo() . bar() |> baz()) . quux())
+assert(false && foo() . (bar() |> baz() . quux()))
+<, which binds lower
+assert(false && foo() < bar() |> baz())
+assert(false && (foo() < bar()) |> baz())
+assert(false && foo() < bar() |> baz())
+assert(false && foo() |> bar() < baz())
+assert(false && foo() |> bar() < baz())
+assert(false && foo() |> (bar() < baz()))
+misc examples
+assert(false && foo() |> (bar() |> baz(...)))

Zend/tests/pipe_operator/call_by_ref.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Pipe operator rejects by-reference functions.
+--FILE--
+<?php
+
+function _modify(int &$a): string {
+    $a += 1;
+    return "foo";
+}
+
+function _append(array &$a): string {
+    $a['bar'] = 'beep';
+}
+
+// Simple variables
+try {
+    $a = 5;
+    $res1 = $a |> _modify(...);
+    var_dump($res1);
+} catch (\Error $e) {
+  echo $e->getMessage(), PHP_EOL;
+}
+
+// Complex variables.
+try {
+    $a = ['foo' => 'beep'];
+    $res2 = $a |> _append(...);
+    var_dump($res2);
+} catch (\Error $e) {
+  echo $e->getMessage(), PHP_EOL;
+}
+
+
+?>
+--EXPECTF--
+_modify(): Argument #1 ($a) could not be passed by reference
+_append(): Argument #1 ($a) could not be passed by reference

Zend/tests/pipe_operator/call_prefer_by_ref.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Pipe operator accepts prefer-by-reference functions.
+--FILE--
+<?php
+
+$a = ['hello', 'world'];
+
+try {
+    $r = $a |> array_multisort(...);
+    var_dump($r);
+} catch (\Error $e) {
+  echo $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+bool(true)

Zend/tests/pipe_operator/complex_ordering.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Functions are executed in the expected order
+--FILE--
+<?php
+
+function foo()     { echo __FUNCTION__, PHP_EOL; return 1; }
+function bar()     { echo __FUNCTION__, PHP_EOL; return false; }
+function baz($in)  { echo __FUNCTION__, PHP_EOL; return $in; }
+function quux($in) { echo __FUNCTION__, PHP_EOL; return $in; }
+
+$result = foo()
+  |> (bar() ? baz(...) : quux(...))
+  |> var_dump(...);
+
+?>
+--EXPECT--
+foo
+bar
+quux
+int(1)

Zend/tests/pipe_operator/compound_userland_calls.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Pipe operator chains
+--FILE--
+<?php
+
+function _test1(int $a): int {
+    return $a + 1;
+}
+
+function _test2(int $a): int {
+    return $a * 2;
+}
+
+$res1 = 5 |> '_test1' |> '_test2';
+
+var_dump($res1);
+?>
+--EXPECT--
+int(12)