[pull] master from php:master

UPGRADING

@@ -757,6 +757,9 @@ PHP 8.6 UPGRADE NOTES
   . CURL_SEEKFUNC_CANTSEEK.
   . CURL_READFUNC_ABORT.
 
+- MySQLi:
+  . MYSQLI_OPT_COMPRESS.
+
 - OpenSSL:
   . OPENSSL_RSA_PSS_SALTLEN_DIGEST.
   . OPENSSL_RSA_PSS_SALTLEN_AUTO.

Zend/tests/access_modifiers/access_modifiers_008.phpt

@@ -33,18 +33,18 @@ class B2 extends A {
         try {
             echo A::mp() . "\n";
         } catch (\Throwable $e) {
-            echo $e->getMessage() . "\n";
+            echo $e::class, ': ', $e->getMessage(), "\n";
         }
         echo B1::ma() . "\n"; // protected method defined also in A
         try {
             echo B1::mp() . "\n"; // protected method defined also in A but as private
         } catch (\Throwable $e) {
-            echo $e->getMessage() . "\n";
+            echo $e::class, ': ', $e->getMessage(), "\n";
         }
         try {
             echo B1::mb() . "\n";
         } catch (\Throwable $e) {
-            echo $e->getMessage() . "\n";
+            echo $e::class, ': ', $e->getMessage(), "\n";
         }
     }
 }
@@ -54,7 +54,7 @@ B2::test();
 ?>
 --EXPECT--
 A::ma()
-Call to private method A::mp() from scope B2
+Error: Call to private method A::mp() from scope B2
 B1::ma()
-Call to protected method B1::mp() from scope B2
-Call to protected method B1::mb() from scope B2
+Error: Call to protected method B1::mp() from scope B2
+Error: Call to protected method B1::mb() from scope B2

Zend/tests/add_002.phpt

@@ -10,8 +10,8 @@ $o->prop = "value";
 
 try {
     var_dump($a + $o);
-} catch (Error $e) {
-    echo "\nException: " . $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $c = $a + $o;
@@ -20,7 +20,7 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Exception: Unsupported operand types: array + stdClass
+TypeError: Unsupported operand types: array + stdClass
 
 Fatal error: Uncaught TypeError: Unsupported operand types: array + stdClass in %s:%d
 Stack trace:

Zend/tests/add_003.phpt

@@ -10,8 +10,8 @@ $o->prop = "value";
 
 try {
     var_dump($o + $a);
-} catch (Error $e) {
-    echo "\nException: " . $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $c = $o + $a;
@@ -20,7 +20,7 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Exception: Unsupported operand types: stdClass + array
+TypeError: Unsupported operand types: stdClass + array
 
 Fatal error: Uncaught TypeError: Unsupported operand types: stdClass + array in %s:%d
 Stack trace:

Zend/tests/add_004.phpt

@@ -7,8 +7,8 @@ $a = array(1,2,3);
 
 try {
     var_dump($a + 5);
-} catch (Error $e) {
-    echo "\nException: " . $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $c = $a + 5;
@@ -17,7 +17,7 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Exception: Unsupported operand types: array + int
+TypeError: Unsupported operand types: array + int
 
 Fatal error: Uncaught TypeError: Unsupported operand types: array + int in %s:%d
 Stack trace:

Zend/tests/add_006.phpt

@@ -14,8 +14,8 @@ $s4 = "25.68";
 try {
     $c = $i + $s1;
     var_dump($c);
-} catch (\TypeError $e) {
-    echo $e->getMessage() . \PHP_EOL;
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 $c = $i + $s2;
 var_dump($c);
@@ -29,8 +29,8 @@ var_dump($c);
 try {
     $c = $s1 + $i;
     var_dump($c);
-} catch (\TypeError $e) {
-    echo $e->getMessage() . \PHP_EOL;
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $c = $s2 + $i;
@@ -45,13 +45,13 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Unsupported operand types: int + string
+TypeError: Unsupported operand types: int + string
 
 Warning: A non-numeric value encountered in %s on line %d
 int(951858)
 int(48550510)
 float(75661.68)
-Unsupported operand types: string + int
+TypeError: Unsupported operand types: string + int
 
 Warning: A non-numeric value encountered in %s on line %d
 int(951858)

Zend/tests/add_007.phpt

@@ -9,8 +9,8 @@ $s1 = "some string";
 
 try {
     var_dump($a + $s1);
-} catch (Error $e) {
-    echo "\nException: " . $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $c = $a + $s1;
@@ -19,7 +19,7 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Exception: Unsupported operand types: array + string
+TypeError: Unsupported operand types: array + string
 
 Fatal error: Uncaught TypeError: Unsupported operand types: array + string in %s:%d
 Stack trace:

Zend/tests/arg_unpack/invalid_type.phpt

@@ -9,29 +9,29 @@ function test(...$args) {
 
 try {
     test(...null);
-} catch (Error $e) {
-    echo $e::class . ": " . $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     test(...42);
-} catch (Error $e) {
-    echo $e::class . ": " . $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     test(...new stdClass);
-} catch (Error $e) {
-    echo $e::class . ": " . $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 try {
     test(1, 2, 3, ..."foo", ...[4, 5]);
-} catch (Error $e) {
-    echo $e::class . ": " . $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     test(1, 2, 3, ...new StdClass, ...3.14, ...[4, 5]);
-} catch (Error $e) {
-    echo $e::class . ": " . $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

Zend/tests/arg_unpack/non_integer_keys.phpt

@@ -12,10 +12,10 @@ function gen() {
 
 try {
     foo(...gen());
-} catch (Error $ex) {
-    echo "Exception: " . $ex->getMessage() . "\n";
+} catch (Throwable $ex) {
+    echo $ex::class, ': ', $ex->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Exception: Keys must be of type int|string during argument unpacking
+Error: Keys must be of type int|string during argument unpacking

Zend/tests/arg_unpack/string_keys.phpt

@@ -9,10 +9,10 @@ set_error_handler(function($errno, $errstr) {
 
 try {
     var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4]));
-} catch (Error $ex) {
-    var_dump($ex->getMessage());
+} catch (Throwable $ex) {
+    echo $ex::class, ': ', $ex->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-string(68) "Cannot use positional argument after named argument during unpacking"
+Error: Cannot use positional argument after named argument during unpacking

Zend/tests/arg_unpack/traversable_throwing_exception.phpt

@@ -21,13 +21,13 @@ function gen() {
 
 try {
     test(1, 2, ...new Foo, ...[3, 4]);
-} catch (Exception $e) { var_dump($e->getMessage()); }
+} catch (Throwable $e) { echo $e::class, ': ', $e->getMessage(), "\n"; }
 
 try {
     test(1, 2, ...gen(), ...[3, 4]);
-} catch (Exception $e) { var_dump($e->getMessage()); }
+} catch (Throwable $e) { echo $e::class, ': ', $e->getMessage(), "\n"; }
 
 ?>
 --EXPECT--
-string(11) "getIterator"
-string(3) "gen"
+Exception: getIterator
+Exception: gen

Zend/tests/array_literal_next_element_error.phpt

@@ -7,18 +7,18 @@ $i = PHP_INT_MAX;
 try {
     $array = [$i => 42, new stdClass];
     var_dump($array);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 function test($x = [PHP_INT_MAX => 42, "foo"]) {}
 try {
     test();
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Cannot add element to the array as the next element is already occupied
-Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied

Zend/tests/array_merge_recursive_next_key_overflow.phpt

@@ -8,7 +8,7 @@ try {
         ['' => [null]],
     );
 } catch (Throwable $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 try {
@@ -17,9 +17,9 @@ try {
         ['foo' => str_repeat('a', 2)],
     );
 } catch (Throwable $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Cannot add element to the array as the next element is already occupied
-Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied

Zend/tests/array_unpack/already_occupied.phpt

@@ -8,26 +8,26 @@ Appending to an array via unpack may fail
 $arr = [1, 2, 3];
 try {
     var_dump([PHP_INT_MAX-1 => 0, ...$arr]);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 try {
     var_dump([PHP_INT_MAX-1 => 0, ...[1, 2, 3]]);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 const ARR = [1, 2, 3];
 function test($x = [PHP_INT_MAX-1 => 0, ...ARR]) {}
 try {
     test();
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Cannot add element to the array as the next element is already occupied
-Cannot add element to the array as the next element is already occupied
-Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied

Zend/tests/array_unpack/classes.phpt

@@ -19,8 +19,8 @@ var_dump(C::$bar);
 
 try {
     var_dump(D::A);
-} catch (Error $ex) {
-    echo "Exception: " . $ex->getMessage() . "\n";
+} catch (Throwable $ex) {
+    echo $ex::class, ': ', $ex->getMessage(), "\n";
 }
 ?>
 --EXPECT--
@@ -44,4 +44,4 @@ array(3) {
   [2]=>
   int(3)
 }
-Exception: Cannot declare self-referencing constant self::B
+Error: Cannot declare self-referencing constant self::B

Zend/tests/array_unpack/non_integer_keys.phpt

@@ -9,10 +9,10 @@ function gen() {
 
 try {
     [...gen()];
-} catch (Error $ex) {
-    echo "Exception: " . $ex->getMessage() . "\n";
+} catch (Throwable $ex) {
+    echo $ex::class, ': ', $ex->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Exception: Keys must be of type int|string during array unpacking
+Error: Keys must be of type int|string during array unpacking

Zend/tests/arrow_functions/006.phpt

@@ -16,23 +16,23 @@ $int_fn = fn(int $x): int => $x;
 var_dump($int_fn($var));
 try {
     $int_fn("foo");
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $varargs = fn(?int... $args): array => $args;
 var_dump($varargs(20, null, 30));
 try {
     $varargs(40, "foo");
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECTF--
 int(2)
 int(10)
-{closure:%s:%d}(): Argument #1 ($x) must be of type int, string given, called in %s on line %d
+TypeError: {closure:%s:%d}(): Argument #1 ($x) must be of type int, string given, called in %s on line %d
 array(3) {
   [0]=>
   int(20)
@@ -41,4 +41,4 @@ array(3) {
   [2]=>
   int(30)
 }
-{closure:%s:%d}(): Argument #2 must be of type ?int, string given, called in %s on line %d
+TypeError: {closure:%s:%d}(): Argument #2 must be of type ?int, string given, called in %s on line %d