[pull] master from php:master

.gdbinit

@@ -340,7 +340,8 @@ define ____print_ht
 			end
 			printf "[%d] ", $i
 			if $p->key
-				printf "%s => ", $p->key->val
+				____print_str $p->key->val $p->key->len
+				printf " => "
 			else
 				printf "%d => ", $p->h
 			end

NEWS

@@ -14,6 +14,7 @@ PHP                                                                        NEWS
 
 - hash:
   . Implemented FR #68109 (Add MurmurHash V3). (Anatol, Michael)
+  . Implemented xxHash support. (Anatol)
 
 - MySQLi:
   . Fixed bug #70372 (Emulate mysqli_fetch_all() for libmysqlclient). (Nikita)

README.md

@@ -40,12 +40,17 @@ For other systems, see the [installation chapter](https://php.net/install).
 *For Windows, see [Build your own PHP on Windows](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2).*
 
 For a minimal PHP build from Git, you will need autoconf, bison, and re2c. For
-a default build, you will additionally need libxml2 and libsqlite3. On Ubuntu,
-you can install these using:
+a default build, you will additionally need libxml2 and libsqlite3.
+
+On Ubuntu, you can install these using:
 
     sudo apt install -y pkg-config build-essential autoconf bison re2c \
                         libxml2-dev libsqlite3-dev
 
+On Fedora, you can install these using:
+
+    sudo dnf install re2c bison autoconf make libtool ccache libxml2-devel sqlite-devel
+
 Generate configure:
 
     ./buildconf

UPGRADING

@@ -19,6 +19,15 @@ PHP 8.1 UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================
 
+- Core:
+  . Access to the $GLOBALS array is now subject to a number of restrictions.
+    Read and write access to individual array elements like $GLOBALS['var']
+    continues to work as-is. Read-only access to the entire $GLOBALS array also
+    continues to be supported. However, write access to the entire $GLOBALS
+    array is no longer supported. For example, array_pop($GLOBALS) will result
+    in an error.
+    RFC: https://wiki.php.net/rfc/restrict_globals_usage
+
 - Fileinfo:
   . The fileinfo functions now accept and return, respectively, finfo objects
     instead of resources.
@@ -60,11 +69,25 @@ PHP 8.1 UPGRADE NOTES
 
 - Standard:
   . version_compare() no longer accepts undocumented operator abbreviations.
+  . htmlspecialchars(), htmlentities(), htmlspecialchars_decode(),
+    html_entitity_decode() and get_html_translation_table() now use
+    ENT_QUOTES | ENT_SUBSTITUTE rather than ENT_COMPAT by default. This means
+    that ' is escaped to ' while previously it was left alone.
+    Additionally, malformed UTF-8 will be replaced by a Unicode substitution
+    character, instead of resulting in an empty string.
 
 ========================================
 2. New Features
 ========================================
 
+- Core:
+  . It is now possible to specify octal integer by using the explicit "0o"/"0O"
+    prefix similar to hexadecimal ("0x"/"0X) and binary ("0b"/"0B") integer literals
+    RFC: https://wiki.php.net/rfc/explicit_octal_notation
+
+- Curl:
+  . Added CURLOPT_DOH_URL option.
+
 - hash:
   . The following functions have changed signatures:
 
@@ -89,6 +112,24 @@ PHP 8.1 UPGRADE NOTES
 
     A valid seed value is within the range from 0 to the plaform defined UINT_MAX, usually 4294967295.
 
+  . Added xxHash. The implementation brings in the following arguments
+
+    - xxh32, 32-bit hash
+    - xxh64, 64-bit hash
+    - xxh3, 64-bit hash
+    - xxh128, 128-bit hash
+
+    The initial hash state can be passed through the `seed` key in the `$options` array, for example:
+
+    ```php
+    $h = hash("xxh3", $data, options: ["seed" => 42]);
+    echo $h, "\n";
+    ```
+
+- Posix:
+  . Added POSIX_RLIMIT_KQUEUES and POSIX_RLIMIT_NPTS. These rlimits are only
+    available on FreeBSD.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -101,6 +142,15 @@ PHP 8.1 UPGRADE NOTES
 5. Changed Functions
 ========================================
 
+- Filter:
+  . The FILTER_FLAG_ALLOW_OCTAL flag of the FILTER_VALIDATE_INT filter now accept
+    octal string with the leading octal prefix ("0o"/"0O")
+    RFC: https://wiki.php.net/rfc/explicit_octal_notation
+
+- GMP:
+  . All GMP function now accept octal string with the leading octal prefix ("0o"/"0O")
+    RFC: https://wiki.php.net/rfc/explicit_octal_notation
+
 ========================================
 6. New Functions
 ========================================

UPGRADING.INTERNALS

@@ -47,3 +47,17 @@ PHP 8.1 INTERNALS UPGRADE NOTES
       getColumnMeta(). The type provided here does not need to match the type
       returned by get_col (in fact no corresponding type might exist, e.g. for
       floats). It should be the closest logical equivalent for the column type.
+    - The transaction, set_attribute, and preparer handler's return type
+      has been formalized to bool instead of int.
+    - The check_liveness handler's return type has been formalized to zend_return
+      instead of int.
+    - The closer, and fetch_error handlers have been voidified.
+    - The quoter handler now returns the quoted string as zend_string* instead
+      of returning a boolean, and the quoted string as a pair of out params.
+      Similarly the unquoted string is now a zend_string* instead of a pair of
+      char* and size_t length.
+    - The doer handler now accepts a zend_string* instead of char* + size_t
+      pair for the SQL statement.
+    - The last_id handler now returns a zend_string* instead of returning a
+      char* and the length as an out param, and accepts a zend_string* instead
+      of char* for the optional sequence/table name.

Zend/tests/array_self_add_globals.phpt

@@ -2,7 +2,6 @@
 Add $GLOBALS to itself
 --FILE--
 <?php
-$GLOBALS += $GLOBALS;
 $x = $GLOBALS + $GLOBALS;
 ?>
 ===DONE===

Zend/tests/attributes/016_custom_attribute_validation.phpt

@@ -2,8 +2,8 @@
 Attribute validation callback of internal attributes.
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) {
-    echo "skip requires zend-test extension\n";
+if (!extension_loaded('zend_test')) {
+    echo "skip requires zend_test extension\n";
 }
 --FILE--
 <?php

Zend/tests/bug78239.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Bug #78239: Deprecation notice during string conversion converted to exception hangs
 --SKIPIF--
-<?php if (!extension_loaded("zend-test")) die("skip requires zend-test extension"); ?>
+<?php if (!extension_loaded("zend_test")) die("skip requires zend_test extension"); ?>
 --FILE--
 <?php
 function handleError($level, $message, $file = '', $line = 0, $context = [])

Zend/tests/bug78335_2.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Bug #78335: Static properties containing cycles report as leak (internal class variant)
 --SKIPIF--
-<?php if (!extension_loaded("zend-test")) die("skip requires zend-test"); ?>
+<?php if (!extension_loaded("zend_test")) die("skip requires zend_test"); ?>
 --FILE--
 <?php
 

Zend/tests/call_to_deprecated_function_args.phpt

@@ -2,7 +2,7 @@
 Check that arguments are freed when calling a deprecated function
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 --FILE--
 <?php
 

Zend/tests/const_deprecation.phpt

@@ -2,7 +2,7 @@
 Internal constant deprecation
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip requires zend-test');
+if (!extension_loaded('zend_test')) die('skip requires zend_test');
 ?>
 --FILE--
 <?php

Zend/tests/globals_001.phpt

@@ -29,6 +29,6 @@ string(%d) "%s"
 Warning: Undefined array key "PHP_SELF" in %s on line %d
 NULL
 
-Warning: Undefined variable $_SERVER in %s on line %d
+Warning: Undefined global variable $_SERVER in %s on line %d
 NULL
 Done

Zend/tests/globals_002.phpt

@@ -32,6 +32,6 @@ string(%d) "%s"
 Warning: Undefined array key "PHP_SELF" in %s on line %d
 NULL
 
-Warning: Undefined variable $_SERVER in %s on line %d
+Warning: Undefined global variable $_SERVER in %s on line %d
 NULL
 Done

Zend/tests/globals_003.phpt

@@ -38,6 +38,6 @@ string(%d) "%s"
 Warning: Undefined array key "PHP_SELF" in %s on line %d
 NULL
 
-Warning: Undefined variable $_SERVER in %s on line %d
+Warning: Undefined global variable $_SERVER in %s on line %d
 NULL
 Done

Zend/tests/globals_004.phpt

@@ -23,6 +23,6 @@ string(%d) "%s"
 Warning: Undefined array key "PHP_SELF" in %s on line %d
 NULL
 
-Warning: Undefined variable $_SERVER in %s on line %d
+Warning: Undefined global variable $_SERVER in %s on line %d
 NULL
 Done

Zend/tests/inherit_internal_static.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Inherit internal static property into userland class
 --SKIPIF--
-<?php if (!extension_loaded('zend-test')) die('skip requires zend-test'); ?>
+<?php if (!extension_loaded('zend_test')) die('skip requires zend_test'); ?>
 --FILE--
 <?php
 

Zend/tests/iterable_or_null.phpt

@@ -2,7 +2,7 @@
 Test Z_PARAM_ITERABLE() and Z_PARAM_ITERABLE_OR_NULL
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/oct_whitespace.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Octal literal followed by whitespace and another number
+--FILE--
+<?php
+var_dump(0o0 2);
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected integer "2", expecting ")" in %s on line %d

Zend/tests/overloaded_func_001.phpt

@@ -2,7 +2,7 @@
 Overloaded function 001
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/overloaded_func_002.phpt

@@ -2,7 +2,7 @@
 Overloaded function 002
 --SKIPIF--
 <?php
-if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
+if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
 ?>
 --FILE--
 <?php

Zend/tests/restrict_globals/globals_in_globals.phpt

@@ -0,0 +1,11 @@
+--TEST--
+$GLOBALS no longer contains 'GLOBALS'
+--FILE--
+<?php
+
+$g = $GLOBALS;
+var_dump(isset($g['GLOBALS']));
+
+?>
+--EXPECT--
+bool(false)

Zend/tests/restrict_globals/invalid_append.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Cannot append to $GLOBALS
+--FILE--
+<?php
+
+$GLOBALS[] = 1;
+
+?>
+--EXPECTF--
+Fatal error: Cannot append to $GLOBALS in %s on line %d

Zend/tests/restrict_globals/invalid_append_isset.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Cannot append to $GLOBALS in isset()
+--FILE--
+<?php
+isset($GLOBALS[]);
+?>
+--EXPECTF--
+Fatal error: Cannot use [] for reading in %s on line %d

Zend/tests/restrict_globals/invalid_append_unset.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Cannot append to $GLOBALS in unset()
+--FILE--
+<?php
+unset($GLOBALS[]);
+?>
+--EXPECTF--
+Fatal error: Cannot use [] for unsetting in %s on line %d

Zend/tests/restrict_globals/invalid_assign.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Cannot assign to $GLOBALS
+--FILE--
+<?php
+
+$GLOBALS = [];
+
+?>
+--EXPECTF--
+Fatal error: $GLOBALS can only be modified using the $GLOBALS[$name] = $value syntax in %s on line %d

Zend/tests/restrict_globals/invalid_assign_list.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Cannot list-assign to $GLOBALS
+--FILE--
+<?php
+
+list($GLOBALS) = [1];
+
+?>
+--EXPECTF--
+Fatal error: $GLOBALS can only be modified using the $GLOBALS[$name] = $value syntax in %s on line %d