Prepare for PHP 8.1

Closes GH-6305.

11 files changed, 15 insertions, 1907 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index df94bd50e5..2d7fbac84c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -327,7 +327,8 @@ Currently we have the following branches in use:
 
 | Branch    |           |
 | --------- | --------- |
-| master    | Active development branch for PHP 8.0, which is open for backwards incompatible changes and major internal API changes. |
+| master    | Active development branch for PHP 8.1, which is open for backwards incompatible changes and major internal API changes. |
+| PHP-8.0   | Is used to release the PHP 8.0.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.4   | Is used to release the PHP 7.4.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.3   | Is used to release the PHP 7.3.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.2   | Is used to release the PHP 7.2.x series. This is an old stable version and is open for security fixes only. |
diff --git a/NEWS b/NEWS
index 64a2b0fa7a..d184029a6a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,388 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.0.0rc2
-
-- Curl:
-  . Fixed bug #80121 (Null pointer deref if CurlHandle directly instantiated).
-    (Nikita)
-
-- Opcache:
-  . Fixed bug #80184 (Complex expression in while / if statements resolves to
-    false incorrectly). (Nikita)
-
-- Reflection:
-  . Fixed bug #80190 (ReflectionMethod::getReturnType() does not handle static
-    as part of union type). (Nikita)
-
-- SPL:
-  . Fixed bug #65387 (Circular references in SPL iterators are not garbage
-    collected). (Nikita)
-
-- Standard:
-  . Fixed bug #64060 (lstat_stat_variation7.phpt fails on certain file systems).
-    (M. Voelker, cmb)
-
-01 Oct 2020, PHP 8.0.0rc1
-
-- CLI:
-  . Allow debug server binding to an ephemeral port via `-S localhost:0`. (Sara)
-
-- Core:
-  . Fixed bug #80109 (Cannot skip arguments when extended debug is enabled).
-    (Nikita)
-
-- ODBC:
-  . Fixed bug #22986 (odbc_connect() may reuse persistent connection). (cmb)
-
-- PDO_Firebird:
-  . Fixed bug #64937 (Firebird PDO preprocessing sql). (Simonov Denis)
-
-- SPL:
-  . SplFixedArray is now IteratorAggregate rather than Iterator. (alexdowad)
-
-- Zlib:
-  . Fixed bug #78792 (zlib.output_compression disabled by Content-Type: image/).
-    (cmb)
-
-17 Sep 2020, PHP 8.0.0beta4
-
-- Core:
-  . Implement #[Attr] Attribute syntax as per final vote in RFC
-    https://wiki.php.net/rfc/shorter_attribute_syntax_change
-  . Fixed bug #80045 (memleak after two set_exception_handler calls with
-    __call). (Nikita)
-  . Fixed bug #80096 (Segmentation fault with named arguments in nested call).
-    (Nikita)
-  . Fixed faulty generator cleanup with yield from. (Bob)
-
-- Date:
-  . Fixed bug #80057 (DateTimeImmutable::createFromFormat() does not populate
-    time). (Derick)
-
-- FFI:
-  . Added FFI\CType::getName() method. (chopins)
-
-03 Sep 2020, 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)
-
-- Fileinfo:
-  . Upgrade to libmagic 5.39. (Anatol)
-
-- Opcache:
-  . Fixed bug #80030 (Optimizer segfault with isset on static property with
-    undef dynamic class name). (Nikita)
-
-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
-
-- Core:
-  . Fixed bug #78236 (convert error on receiving variables when duplicate [).
-    (cmb)
-  . Fixed bug #79108 (Referencing argument in a function makes it a reference
-    in the stack trace). (Nikita)
-  . Fixed bug #79897 (Promoted constructor params with attribs cause crash).
-    (Deus Kane)
-  . Fixed bug #79946 (Build fails due to undeclared UINT32_C). (Nikita)
-  . Fixed bug #77561 (Shebang line not stripped for non-primary script).
-    (Nikita)
-  . Fixed bug #79948 (Exit in auto-prepended file does not abort PHP execution).
-    (Nikita)
-  . Fixed bug #65275 (Calling exit() in a shutdown function does not change the
-    exit value in CLI). (Nikita)
-  . Fixed bug #62294 (register_shutdown_function() does not correctly handle
-    exit code). (Nikita)
-  . Fixed bug #79927 (Generator doesn't throw exception after multiple yield
-    from iterable). (Nikita)
-  . Fixed bug #78770 (Incorrect callability check inside internal methods).
-    (Nikita)
-
-- Date:
-  . Fixed bug #60302 (DateTime::createFromFormat should new static(), not new
-    self()). (Derick)
-  . Implemented FR #79903 (datetime: new format "p", same as "P" but returning
-    "Z" for UTC). (gharlan)
-
-- JIT:
-  . Fixed bug #79864 (JIT segfault in Symfony OptionsResolver). (Dmitry)
-  . Fixed bug #79888 (Incorrect execution with JIT enabled). (Dmitry)
-
-- LDAP:
-  . Fixed memory leaks. (ptomulik)
-
-- OCI8:
-  . Modernized oci_register_taf_callback() callable argument parsing
-    implementation. (girgias)
-
-23 Jul 2020, PHP 8.0.0alpha3
-
-- Core:
-  . Fixed bug #79790 ("Illegal offset type" exception during AST evaluation
-    not handled properly). (Nikita)
-  . Fixed bug #79791 (Assertion failure when unsetting variable during binary
-    op). (Nikita)
-  . Fixed bug #79841 (Syntax error in configure / unescaped "[]" in php.m4).
-    (Nikita)
-  . Fixed bug #79828 (Segfault when trying to access non-existing variable).
-    (Nikita)
-  . Fixed bug #79852 (count(DOMNodeList) doesn't match
-    count(IteratorIterator(DOMNodeList))). (Nikita)
-  . Fixed bug #79867 (Promoted untyped properties should get null default
-    value). (Nikita)
-
-- Standard:
-  . Fixed bug #79868 (Sorting with array_unique gives unwanted result). (Nikita)
-
-09 Jul 2020, PHP 8.0.0alpha2
-
-- FFI:
-  . Fixed bug #79749 (Converting FFI instances to bool fails). (cmb)
-
-- JIT:
-  . Fixed bug #79743 (Fatal error when assigning to array property
-    with JIT enabled). (Laruence)
-
-- PCRE:
-  . Updated to PCRE2 10.35. (cmb)
-
-25 Jun 2020, PHP 8.0.0alpha1
-
-- Core:
-  . Removed the pdo_odbc.db2_instance_name php.ini directive. (Kalle)
-  . Fixed bug #77619 (Wrong reflection on MultipleIterator::__construct).
-    (Fabien Villepinte)
-  . Fixed bug #65274 (Enhance undefined class constant error with class name).
-    (Nikita)
-  . Fixed bug #49555 (Fatal error "Function must be a string" message should be
-    renamed). (Nikita)
-  . Fixed bug #70839 (Converting optional argument to variadic forbidden by LSP
-    checks). (Nikita)
-  . Fixed bug #69084 (Unclear error message when not implementing a renamed
-    abstract trait function). (Nikita)
-  . Fixed bug #62609 (Allow implementing Traversable on abstract classes).
-    (Nikita)
-  . Fixed bug #79462 (method_exists and property_exists incoherent behavior).
-    (cmb)
-  . Fixed bug #79368 ("Unexpected end of file" is not an acceptable error
-    message). (Alex Dowad)
-  . Fixed bug #36365 (scandir duplicates file name at every 65535th file).
-    (cmb)
-  . Use SSE2 instructions do locale independent strtolower. (Laruence)
-  . Fixed bug #79521 (Check __set_state structure). (carusogabriel)
-  . Fixed bug #79467 (data:// wrappers are writable). (cmb)
-  . Implemented FR #47074 (phpinfo() reports "On" as 1 for the some
-    extensions). (cmb)
-  . Implemented FR #72089 (require() throws fatal error instead of exception).
-    (Nikita)
-  . Fixed bug #77966 (Cannot alias a method named "namespace"). (Nikita)
-
-- BZ2:
-  . Fixed bug #71263 (fread() does not report bzip2.decompress errors). (cmb)
-
-- CURL:
-  . Bumped required libcurl version to 7.29.0. (cmb)
-
-- Date:
-  . Fixed bug #65547 (Default value for sunrise/sunset zenith still wrong).
-    (cmb)
-  . Fixed bug #69044 (discrepancy between time and microtime). (krakjoe)
-
-- DOM:
-  . Add property DOMXPath::$registerNodeNamespaces and constructor argument
-    that allow global flag to configure query() or evaluate() calls.
-
-- Enchant:
-  . Add LIBENCHANT_VERSION macro.
-  . Deprecate enchant_broker_set_dict_path, enchant_broker_get_dict_path,
-    enchant_dict_add_to_personal and enchant_dict_is_in_session.
-  . Add enchant_dict_add and enchant_dict_is_added functions.
-  . Use libenchant-2 when available.
-
-- FPM:
-  . Fixed bug #64865 (Search for .user.ini files from script dir up to
-    CONTEXT_DOCUMENT_ROOT). (Will Bender)
-  . Add pm.status_listen option. (Jakub Zelenka)
-
-- GD:
-  . Fixed bug #55005 (imagepolygon num_points requirement). (cmb)
-  . Replaced gd resources with objects. (Mark Randall)
-  . Made the $num_points parameter of php_imagepolygon optional. (cmb)
-  . Removed deprecated image2wbmp(). (cmb)
-  . Removed deprecated png2wbmp() and jpeg2wbmp(). (cmb)
-  . Added imagegetinterpolation(). (cmb)
-
-- Iconv:
-  . Dropped support for iconv without proper errno setting. (cmb)
-
-- Intl:
-  . Removed deprecated INTL_IDNA_VARIANT_2003. (cmb)
-
-- JIT:
-  . Fixed bug #79582 (Crash seen when opcache.jit=1235 and
-    opcache.jit_debug=2). (Laruence)
-  . Fixed bug #77857 (Wrong result if executed with JIT). (Laruence)
-  . Fixed bug #79255 (PHP cannot be compiled with enable JIT).
-    (Laruence, Dmitry)
-
-- JSON:
-  . The JSON extension is now an integral part of PHP and cannot be disabled
-    as per RFC: https://wiki.php.net/rfc/always_enable_json (tandre)
-
-- LDAP:
-  . Removed deprecated ldap_sort. (mcmic)
-
-- MBString:
-  . Fixed bug #76999 (mb_regex_set_options() return current options). (cmb)
-  . Removed the unused $is_hex parameter from mb_decode_numericentity(). (cmb)
-
-- MySQLi:
-  . Fixed bug #76809 (SSL settings aren't respected when persistent connections
-    are used). (fabiomsouto)
-
-- mysqlnd:
-  . Fixed #60594 (mysqlnd exposes 160 lines of stats in phpinfo). (PeeHaa)
-
-- OCI8:
-  . Deprecated old OCI8 function aliases. (Jens de Nies)
-  . Removed obsolete no-op function oci_internal_debug(). (Jens de Nies)
-
-- OpCache:
-  . Fixed bug #78654 (Incorrectly computed opcache checksum on files with
-    non-ascii characters). (mhagstrand)
-  . Fixed bug #76535 (Opcache does not replay compile-time warnings). (Nikita)
-  . Fixed bug #79665 (ini_get() and opcache_get_configuration() inconsistency).
-    (cmb)
-
-- OpenSSL:
-  . Added Cryptographic Message Syntax (CMS) support. (Eliot Lear)
-
-- PCRE:
-  . Don't ignore invalid escape sequences. (sjon)
-
-- PGSQL:
-  . Bumped required libpq version to 9.1. (cmb)
-
-- PDO:
-  . Changed default PDO error mode to exceptions. (AllenJB)
-  . Fixed bug #77849 (Disable cloning of PDO handle/connection objects).
-    (camporter)
-
-- PDO_OCI:
-  . Added support for setting and getting the oracle OCI 18c call timeout.
-    (camporter)
-
-- PDO_PGSQL:
-  . Bumped required libpq version to 9.1. (cmb)
-
-- phpdbg:
-  . Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
-  . Fixed bug #76801 (too many open files). (alekitto)
-  . Fixed bug #77800 (phpdbg segfaults on listing some conditional breakpoints).
-    (krakjoe)
-  . Fixed bug #77805 (phpdbg build fails when readline is shared). (krakjoe)
-
-- Reflection:
-  . Fixed bug #78697 (ReflectionClass::implementsInterface - inaccurate error
-    message with traits). (villfa)
-  . Implement ReflectionProperty::hasDefaultValue and
-    Reflection::getDefaultValue (beberlei)
-  . Fixed bug #64592 (ReflectionClass::getMethods() returns methods out of
-    scope). (Nikita)
-  . Fixed bug #77325 (ReflectionClassConstant::$class returns wrong class when
-    extending). (Nikita)
-  . Fixed bug #69180 (Reflection does not honor trait conflict resolution /
-    method aliasing). (Nikita)
-  . Fixed bug #74939 (Nested traits' aliased methods are lowercased). (Nikita)
-  . Implement #79628 (Add $filter parameter for ReflectionClass::getConstants
-    and ReflectionClass::getReflectionConstants) (carusogabriel)
-
-- Session:
-  . Fixed bug #78624 (session_gc return value for user defined session
-    handlers). (bshaffer)
-  . Fixed bug #73529 (session_decode() silently fails on wrong input). (cmb)
-
-- Shmop:
-  . Converted shmop resources to objects. (cmb)
-
-- SimpleXML:
-  . Fixed bug #75245 (Don't set content of elements with only whitespaces).
-    (eriklundin)
-  . Fixed bug #63575 (Root elements are not properly cloned). (cmb)
-
-- sodium:
-  . Fixed bug #77646 (sign_detached() strings not terminated). (Frank)
-
-- SQLite3:
-  . Added SQLite3::setAuthorizer() and respective class constants. (bohwaz)
-
-- SPL:
-  . Fixed bug #71236 (Second call of spl_autoload_register() does nothing if it
-    has no arguments). (Nikita)
-  . Fixed bug #65006 (spl_autoload_register fails with multiple callables using
-    self, same method). (Nikita)
-
-- Standard:
-  . Implemented FR #78638 (__PHP_Incomplete_Class should be final). (Laruence)
-  . Fixed bug #77204 (getimagesize(): Read error! should mention file path).
-    (peter279k)
-  . Fixed bug #76859 (stream_get_line skips data if used with data-generating
-    filter). (kkopachev)
-  . Fixed bug #78385 (parse_url() does not include 'query' when question mark
-    is the last char). (Islam Israfilov)
-  . Fixed bug #75902 (str_replace should warn when misused with nested arrays).
-    (Nikita)
-  . Fixed bug #47983 (mixed LF and CRLF line endings in mail()). (cmb)
-  . Made quoting of cmd execution functions consistent. (cmb)
-
-- tidy:
-  . Removed the unused $use_include_path parameter from tidy_repair_string().
-    (cmb)
-
-- XML:
-  . Fixed bug #76874 (xml_parser_free() should never leak memory). (Nikita)
-
-- XMLWriter:
-  . Changed functions to accept/return XMLWriter objects instead of resources.
-    (cmb)
-  . Implemented FR #79344 (xmlwriter_write_attribute_ns: $prefix should be
-    nullable). (cmb)
-
-- Zip:
-  . Fixed bug #72374 (remove_path strips first char of filename). (tyage, Remi)
-  . Add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods. (Remi)
-  . Add ZipArchive::setProgressCallback method (since libzip 1.3.0). (Remi)
-  . Add ZipArchive::setCancelCallback method (since libzip 1.6.0). (Remi)
-  . Add optional "flags" parameter to ZipArchive::addEmptyDir, addFile and
-    addFromString methods. (Remi)
-  . Add "flags" options to ZipArchive::addGlob and addPattern methods
-    keeping previous behavior having FL_OVERWRITE by default. (Remi)
-  . Add ZipArchive::replaceFile() method. (Remi)
-  . Add lastId property to ZipArchive. (Remi)
-  . ZipArchive::status and ZipArchive::statusSys properties and
-    ZipArchive::getStatusString() method stay valid after the archive
-    is closed. (Remi)
-  . Fixed bug #50678 (files extracted by ZipArchive class lost their
-    original modified time). (Remi)
-  . Implemented FR #77960 (add compression / encryption options for
-    ZipArchive::addGlob and ZipArchive::addPattern). (Remi)
-  . Add ZipArchive::EM_UNKNOWN and ZipArchive::EM_TRAD_PKWARE constants. (Remi)
-  . Add ZipArchive::isCompressionMethodSupported() and
-    ZipArchive::isEncryptionMethodSupported() method (libzip 1.7.0). (Remi)
-
-- Zlib:
-  . Fixed bug #71417 (fread() does not report zlib.inflate errors). (cmb)
+?? ??? ????, PHP 8.1.0alpha1
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/UPGRADING b/UPGRADING
index 09a317da75..715d0c35b7 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,4 +1,4 @@
-PHP 8.0 UPGRADE NOTES
+PHP 8.1 UPGRADE NOTES
 
 1. Backward Incompatible Changes
 2. New Features
@@ -15,1126 +15,58 @@ PHP 8.0 UPGRADE NOTES
 13. Other Changes
 14. Performance Improvements
 
-
 ========================================
 1. Backward Incompatible Changes
 ========================================
 
-- 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
-    constructors. The __construct() method should be used instead.
-  . Removed ability to call non-static methods statically.
-    Thus `is_callable` will fail when checking for a non-static method with a
-    classname (must check with an object instance).
-  . Removed (unset) cast.
-  . Removed track_errors ini directive. This means that $php_errormsg is no
-    longer available. The error_get_last() function may be used instead.
-  . Removed the ability to define case-insensitive constants. The third
-    argument to define() may no longer be true.
-  . Access to undefined constants now always results in an Error exception.
-    Previously, unqualified constant accesses resulted in a warning and were
-    interpreted as strings.
-  . Removed ability to specify an autoloader using an __autoload() function.
-    spl_autoload_register() should be used instead.
-  . Removed the $errcontext argument for custom error handlers.
-  . Removed create_function(). Anonymous functions may be used instead.
-  . Removed each(). foreach or ArrayIterator should be used instead.
-  . Removed ability to unbind $this from closures that were created from a
-    method, using Closure::fromCallable() or ReflectionMethod::getClosure().
-  . Also removed ability to unbind $this from proper closures that contain uses
-    of $this.
-  . Removed ability to use array_key_exists() with objects. Use one of isset()
-    or property_exists() instead.
-  . Made the behavior of array_key_exists() regarding the type of the key
-    parameter consistent with isset() and normal array access. All key types now
-    use the usual coercions and array/object keys throw a TypeError.
-  . Any array that has a number n as its first numeric key will use n+1 for
-    its next implicit key, even if n is negative.
-    RFC: https://wiki.php.net/rfc/negative_array_index
-  . The default error_reporting level is now E_ALL. Previously it excluded
-    E_NOTICE and E_DEPRECATED.
-  . display_startup_errors is now enabled by default.
-  . Using "parent" inside a class that has no parent will now result in a
-    fatal compile-time error.
-  . The @ operator will no longer silence fatal errors (E_ERROR, E_CORE_ERROR,
-    E_COMPILE_ERROR, E_USER_ERROR, E_RECOVERABLE_ERROR, E_PARSE). Error handlers
-    that expect error_reporting to be 0 when @ is used, should be adjusted to
-    use a mask check instead:
-
-        // Replace
-        function my_error_handler($err_no, $err_msg, $filename, $linenum) {
-            if (error_reporting() == 0) {
-                return; // Silenced
-            }
-            // ...
-        }
-
-        // With
-        function my_error_handler($err_no, $err_msg, $filename, $linenum) {
-            if (!(error_reporting() & $err_no)) {
-                return; // Silenced
-            }
-            // ...
-        }
-
-    Additionally, care should be taken that error messages are not displayed in
-    production environments, which can result in information leaks. Please
-    ensure that display_errors=Off is used in conjunction with error logging.
-  . Following the hash comment operator # immediately with an opening bracket
-    is not supported as a comment anymore since this syntax is now used for
-    attributes.
-    RFC: https://wiki.php.net/rfc/shorter_attribute_syntax_change
-  . Inheritance errors due to incompatible method signatures (LSP violations)
-    will now always generate a fatal error. Previously a warning was generated
-    in some cases.
-    RFC: https://wiki.php.net/rfc/lsp_errors
-  . The precedence of the concatenation operator has changed relative to
-    bitshifts and addition as well as subtraction.
-    RFC: https://wiki.php.net/rfc/concatenation_precedence
-  . Arguments with a default value that resolves to null at runtime will no
-    longer implicitly mark the argument type as nullable. Either use an explicit
-    nullable type, or an explicit null default value instead.
-
-        // Replace
-        function test(int $arg = CONST_RESOLVING_TO_NULL) {}
-        // With
-        function test(?int $arg = CONST_RESOLVING_TO_NULL) {}
-        // Or
-        function test(int $arg = null) {}
-  . A number of warnings have been converted into Error exceptions:
-
-    * Attempting to write to a property of a non-object. Previously this
-      implicitly created an stdClass object for null, false and empty strings.
-    * Attempting to append an element to an array for which the PHP_INT_MAX key
-      is already used.
-    * Attempting to use an invalid type (array or object) as an array key or
-      string offset.
-    * Attempting to write to an array index of a scalar value.
-    * Attempting to unpack a non-array/Traversable.
-
-    A number of notices have been converted into warnings:
-
-    * Attempting to read an undefined variable.
-    * Attempting to read an undefined property.
-    * Attempting to read an undefined array key.
-    * Attempting to read a property of a non-object.
-    * Attempting to access an array index of a non-array.
-    * Attempting to convert an array to string.
-    * Attempting to use a resource as an array key.
-    * Attempting to use null, a boolean, or a float as a string offset.
-    * Attempting to read an out-of-bounds string offset.
-    * Attempting to assign an empty string to a string offset.
-
-    RFC: https://wiki.php.net/rfc/engine_warnings
-  . Attempting to assign multiple bytes to a string offset will now emit a
-    warning.
-  . Unexpected characters in source files (such as null bytes outside of
-    strings) will now result in a ParseError exception instead of a compile
-    warning.
-  . Uncaught exceptions now go through "clean shutdown", which means that
-    destructors will be called after an uncaught exception.
-  . Compile time fatal error "Only variables can be passed by reference" has
-    been delayed until runtime and converted to "Argument cannot be passed by
-    reference" exception.
-  . Some "Only variables should be passed by reference" notices have been
-    converted to "Argument cannot be passed by reference" exception.
-  . The generated name for anonymous classes has changed. It will now include
-    the name of the first parent or interface:
-
-        new class extends ParentClass {};
-        // -> ParentClass@anonymous
-        new class implements FirstInterface, SecondInterface {};
-        // -> FirstInterface@anonymous
-        new class {};
-        // -> class@anonymous
-
-    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:
-
-        class X {
-            use T1, T2 {
-               func as otherFunc;
-            }
-            function func() {}
-        }
-
-    If both T1::func() and T2::func() exist, this code was previously silently
-    accepted, and func as assumed to refer to T1::func. Now it will generate a
-    fatal error instead, and either T1::func or T2::func needs to be written
-    explicitly.
-  . The signature of abstract methods defined in traits is now checked against
-    the implementing class method:
-
-        trait MyTrait {
-            abstract private function neededByTrait(): string;
-        }
-
-        class MyClass {
-            use MyTrait;
-
-            // Error, because of return type mismatch.
-            private function neededByTrait(): int { return 42; }
-        }
-
-    RFC: https://wiki.php.net/rfc/abstract_trait_method_validation
-  . Disabled functions are now treated exactly like non-existent functions.
-    Calling a disabled function will report it as unknown, and redefining a
-    disabled function is now possible.
-  . data: stream wrappers are no longer writable, which matches the documented
-    behavior.
-  . The arithmetic and bitwise operators
-    +, -, *, /, **, %, <<, >>, &, |, ^, ~, ++, --
-    will now consistently throw a TypeError when one of the operands is an
-    array, resource or non-overloaded object. The only exception to this is the
-    array + array merge operation, which remains supported.
-    RFC: https://wiki.php.net/rfc/arithmetic_operator_type_checks
-  . Float to string casting will now always behave locale-independently.
-    RFC: https://wiki.php.net/rfc/locale_independent_float_to_string
-  . Removed support for deprecated curly braces for offset access
-    RFC: https://wiki.php.net/rfc/deprecate_curly_braces_array_access
-  . Applying the final modifier on a private method will now produce a warning
-    unless that method is the constructor.
-    RFC: https://wiki.php.net/rfc/inheritance_private_methods
-  . If an object constructor exit()s, the object destructor will no longer be
-    called. This matches the behavior when the constructor throws.
-  . Non-strict comparisons between numbers and non-numeric strings now work by
-    casting the number to string and comparing the strings. Comparisons between
-    numbers and numeric strings continue to work as before. Notably, this means
-    that `0 == "not-a-number"` is considered false now.
-    RFC: https://wiki.php.net/rfc/string_to_number_comparison
-  . Namespaced names can no longer contain whitespace: While `Foo\Bar` will be
-    recognized as a namespaced name, `Foo \ Bar` will not. Conversely, reserved
-    keywords are now permitted as namespace segments, which may also change the
-    interpretation of code: `new\x` is now the same as `constant('new\x')`, not
-    `new \x()`.
-    RFC: https://wiki.php.net/rfc/namespaced_names_as_token
-  . Nested ternaries now require explicit parentheses.
-    RFC: https://wiki.php.net/rfc/ternary_associativity
-  . debug_backtrace() and Exception::getTrace() will no longer provide
-    references to arguments. It will not be possible to change function
-    arguments through the backtrace.
-  . Numeric string handling has been altered to be more intuitive and less
-    error-prone. Trailing whitespace is now allowed in numeric strings for
-    consistency with how leading whitespace is treated. This mostly affects:
-     - The is_numeric() function
-     - String-to-string comparisons
-     - Type declarations
-     - Increment and decrement operations
-    The concept of a "leading-numeric string" has been mostly dropped; the
-    cases where this remains exist in order to ease migration. Strings which
-    emitted an E_NOTICE "A non well-formed numeric value encountered" will now
-    emit an E_WARNING "A non-numeric value encountered" and all strings which
-    emitted an E_WARNING "A non-numeric value encountered" will now throw a
-    TypeError. This mostly affects:
-     - Arithmetic operations
-     - Bitwise operations
-    This E_WARNING to TypeError change also affects the E_WARNING
-    "Illegal string offset 'string'" for illegal string offsets. The behavior
-    of explicit casts to int/float from strings has not been changed.
-    RFC: https://wiki.php.net/rfc/saner-numeric-strings
-  . Magic Methods will now have their arguments and return types checked if
-    they have them declared. The signatures should match the following list:
-
-      __call(string $name, array $arguments): mixed
-      __callStatic(string $name, array $arguments): mixed
-      __clone(): void
-      __debugInfo(): ?array
-      __get(string $name): mixed
-      __invoke(mixed $arguments): mixed
-      __isset(string $name): bool
-      __serialize(): array
-      __set(string $name, mixed $value): void
-      __set_state(array $properties): object
-      __sleep(): array
-      __unserialize(array $data): void
-      __unset(string $name): void
-      __wakeup(): void
-
-    RFC: https://wiki.php.net/rfc/magic-methods-signature
-  . call_user_func_array() array keys will now be interpreted as parameter names,
-    instead of being silently ignored.
-
-- COM:
-  . Removed the ability to import case-insensitive constants from type
-    libraries. The second argument to com_load_typelib() may no longer be false;
-    com.autoregister_casesensitive may no longer be disabled; case-insensitive
-    markers in com.typelib_file are ignored.
-
-- Curl:
-  . CURLOPT_POSTFIELDS no longer accepts objects as arrays. To interpret an
-    object as an array, perform an explicit (array) cast. The same applies to
-    other options accepting arrays as well.
-
-- Date:
-  . mktime() and gmmktime() now require at least one argument. time() can be
-    used to get the current timestamp.
-
-- dom:
-  . Remove unimplemented classes from ext/dom that had no behavior and contained
-    test data. These classes have also been removed in the latest version of DOM
-    standard:
-
-     * DOMNameList
-     * DomImplementationList
-     * DOMConfiguration
-     * DomError
-     * DomErrorHandler
-     * DOMImplementationSource
-     * DOMLocator
-     * DOMUserDataHandler
-     * DOMTypeInfo
-
-- Enchant:
-  . enchant_broker_list_dicts(), enchant_broker_describe() and
-    enchant_dict_suggest() will now return an empty array instead of null.
-  . enchant_broker_init() will now return an EnchantBroker object rather than
-    a resource. Return value checks using is_resource() should be replaced with
-    checks for `false`.
-  . enchant_broker_request_dict() and enchant_broker_request_pwl_dict() will now
-    return an EnchantDictionary object rather than a resource. Return value
-    checks using is_resource() should be replaced with checks for `false`.
-
-- Exif:
-  . Removed read_exif_data(). exif_read_data() should be used instead.
-
-- Filter:
-  . The FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED flags for the
-    FILTER_VALIDATE_URL filter have been removed. The scheme and host are (and
-    have been) always required.
-  . The INPUT_REQUEST and INPUT_SESSION source for filter_input() etc have been
-    removed. These were never implemented and their use always generated a
-    warning.
-
-- GD:
-  . The GD extension now uses objects as the underlying data structure for
-    images, rather than resources. These objects are completely opaque, i.e.
-    they don't have any methods.
-  . The deprecated function image2wbmp() has been removed.
-    RFC: https://wiki.php.net/rfc/image2wbmp
-  . The deprecated functions png2wbmp() and jpeg2wbmp() have been removed.
-    RFC: https://wiki.php.net/rfc/deprecate-png-jpeg-2wbmp
-  . The default $mode parameter of imagecropauto() no longer accepts -1.
-    IMG_CROP_DEFAULT should be used instead.
-
-- GMP:
-  . gmp_random() has been removed. One of gmp_random_range() or
-    gmp_random_bits() should be used instead.
-
-- Iconv:
-  . iconv() implementations which do not properly set errno in case of errors
-    are no longer supported.
-
-- IMAP:
-  . The unused default_host argument of imap_headerinfo() has been removed.
-  . The imap_header() function which is an alias of imap_headerinfo() has been removed.
-
-- Intl:
-  . The deprecated constant INTL_IDNA_VARIANT_2003 has been removed.
-    RFC: https://wiki.php.net/rfc/deprecate-and-remove-intl_idna_variant_2003
-  . The deprecated Normalizer::NONE constant has been removed.
-  . The IntlDateFormatter::RELATIVE_FULL, IntlDateFormatter::RELATIVE_LONG,
-    IntlDateFormatter::RELATIVE_MEDIUM, and IntlDateFormatter::RELATIVE_SHORT
-    constants have been added.
-
-- LDAP:
-  . The deprecated function ldap_sort has been removed.
-  . The deprecated function ldap_control_paged_result has been removed.
-  . The deprecated function ldap_control_paged_result_response has been removed.
-  . The interface of ldap_set_rebind_proc has changed; the $callback parameter
-    does not accept empty string anymore; null value shall be used instead.
-
-- Mbstring:
-  . The mbstring.func_overload directive has been removed. The related
-    MB_OVERLOAD_MAIL, MB_OVERLOAD_STRING, and MB_OVERLOAD_REGEX constants have
-    also been removed. Finally, the "func_overload" and "func_overload_list"
-    entries in mb_get_info() have been removed.
-  . mb_parse_str() can no longer be used without specifying a result array.
-  . A number of deprecated mbregex aliases have been removed. See the following
-    list for which functions should be used instead:
-
-     * mbregex_encoding()      -> mb_regex_encoding()
-     * mbereg()                -> mb_ereg()
-     * mberegi()               -> mb_eregi()
-     * mbereg_replace()        -> mb_ereg_replace()
-     * mberegi_replace()       -> mb_eregi_replace()
-     * mbsplit()               -> mb_split()
-     * mbereg_match()          -> mb_ereg_match()
-     * mbereg_search()         -> mb_ereg_search()
-     * mbereg_search_pos()     -> mb_ereg_search_pos()
-     * mbereg_search_regs()    -> mb_ereg_search_regs()
-     * mbereg_search_init()    -> mb_ereg_search_init()
-     * mbereg_search_getregs() -> mb_ereg_search_getregs()
-     * mbereg_search_getpos()  -> mb_ereg_search_getpos()
-     * mbereg_search_setpos()  -> mb_ereg_search_setpos()
-
-  . The 'e' modifier for mb_ereg_replace() has been removed.
-    mb_ereg_replace_callback() should be used instead.
-  . A non-string pattern argument to mb_ereg_replace() will now be interpreted
-    as a string instead of an ASCII codepoint. The previous behavior may be
-    restored with an explicit call to chr().
-  . The needle argument for mb_strpos(), mb_strrpos(), mb_stripos(),
-    mb_strripos(), mb_strstr(), mb_stristr(), mb_strrchr() and mb_strrichr() can
-    now be empty.
-  . The $is_hex parameter, which was not used internally, has been removed from
-    mb_decode_numericentity().
-  . The legacy behavior of passing the encoding as the third argument instead
-    of an offset for the mb_strrpos() function has been removed; provide an
-    explicit 0 offset with the encoding as the fourth argument instead.
-  . The ISO_8859-* character encoding aliases have been replaced by ISO8859-*
-    aliases for better interoperability with the iconv extension. The mbregex
-    ISO 8859 aliases with underscores (ISO_8859_* and ISO8859_*) have also been
-    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.
-
-- ODBC:
-  . odbc_connect() no longer reuses persistent connections.
-  . The unused flags parameter of odbc_exec() has been removed.
-
-- OpenSSL:
-  . openssl_x509_read() and openssl_csr_sign() will now return an
-    OpenSSLCertificate object rather than a resource. Return value checks using
-    is_resource() should be replaced with checks for `false`.
-  . The openssl_x509_free() function is deprecated and no longer has an effect,
-    instead the OpenSSLCertificate instance is automatically destroyed if it is no
-    longer referenced.
-  . openssl_csr_new() will now return an OpenSSLCertificateSigningRequest object
-    rather than a resource. Return value checks using is_resource() should be
-    replaced with checks for `false`.
-  . openssl_pkey_new() will now return an OpenSSLAsymmetricKey object rather than a
-    resource. Return value checks using is_resource() should be replaced with
-    checks for `false`.
-  . The openssl_pkey_free() function is deprecated and no longer has an effect,
-    instead the OpenSSLAsymmetricKey instance is automatically destroyed if it is no
-    longer referenced.
-  . openssl_seal() and openssl_open() now require $method to be passed, as the
-    previous default of "RC4" is considered insecure.
-
-- PCRE:
-  . When passing invalid escape sequences they are no longer interpreted as
-    literals. This behavior previously required the X modifier - which is
-    now ignored.
-
-- PDO:
-  . The default error handling mode has been changed from "silent" to
-    "exceptions". See https://www.php.net/manual/en/pdo.error-handling.php
-    for details of behavior changes and how to explicitly set this attribute.
-    RFC: https://wiki.php.net/rfc/pdo_default_errmode
-  . The signatures of some PDO methods have changed:
-
-        PDO::query(
-            string $statement, ?int $fetch_mode = null, ...$fetch_mode_args)
-        PDOStatement::setFetchMode(int $mode, ...$params)
-
-- PDO_ODBC:
-  . The php.ini directive pdo_odbc.db2_instance_name has been removed
-
-- pgsql:
-  . The deprecated pg_connect() syntax using multiple parameters instead of a
-    connection string is no longer supported.
-  . The deprecated pg_lo_import() and pg_lo_export() signature that passes the
-    connection as the last argument is no longer supported. The connection
-    should be passed as first argument instead.
-  . pg_fetch_all() will now return an empty array instead of false for result
-    sets with zero rows.
-
-- Phar:
-  . Metadata associated with a phar will no longer be automatically unserialized,
-    to fix potential security vulnerabilities due to object instantiation, autoloading, etc.
-    RFC: https://wiki.php.net/rfc/phar_stop_autoloading_metadata
-
-- Reflection:
-  . The method signatures
-
-        ReflectionClass::newInstance($args)
-        ReflectionFunction::invoke($args)
-        ReflectionMethod::invoke($object, $args)
-
-    have been changed to:
-
-        ReflectionClass::newInstance(...$args)
-        ReflectionFunction::invoke(...$args)
-        ReflectionMethod::invoke($object, ...$args)
-
-    Code that must be compatible with both PHP 7 and PHP 8 can use the following
-    signatures to be compatible with both versions:
-
-        ReflectionClass::newInstance($arg = null, ...$args)
-        ReflectionFunction::invoke($arg = null, ...$args)
-        ReflectionMethod::invoke($object, $arg = null, ...$args)
-
-  . The ReflectionType::__toString() method will now return a complete debug
-    representation of the type, and is no longer deprecated. In particular the
-    result will include a nullability indicator for nullable types. The format
-    of the return value is not stable and may change between PHP versions.
-  . Reflection export() methods have been removed.
-  . The following methods can now return information about default values of
-    parameters of internal functions:
-        ReflectionParameter::isDefaultValueAvailable()
-        ReflectionParameter::getDefaultValue()
-        ReflectionParameter::isDefaultValueConstant()
-        ReflectionParameter::getDefaultValueConstantName()
-  . ReflectionMethod::isConstructor() and ReflectionMethod::isDestructor() now
-    also return true for `__construct` and `__destruct` methods of interfaces.
-    Previously, this would only be true for methods of classes and traits.
-  . ReflectionType::isBuiltin() method has been moved to ReflectionNamedType.
-    ReflectionUnionType does not have it.
-
-- Sockets:
-  . The deprecated AI_IDN_ALLOW_UNASSIGNED and AI_IDN_USE_STD3_ASCII_RULES
-    flags for socket_addrinfo_lookup() have been removed.
-  . socket_create(), socket_create_listen(), socket_accept(),
-    socket_import_stream(), socket_addrinfo_connect(), socket_addrinfo_bind(),
-    and socket_wsaprotocol_info_import() will now return a Socket object rather
-    than a resource. Return value checks using is_resource() should be replaced
-    with checks for `false`.
-  . socket_addrinfo_lookup() will now return an array of AddressInfo objects
-    rather than resources.
-
-- SPL:
-  . SplFileObject::fgetss() has been removed.
-  . SplHeap::compare($a, $b) now specifies a method signature. Inheriting
-    classes implementing this method will now have to use a compatible
-    method signature.
-  . SplDoublyLinkedList::push() now returns void instead of true
-  . SplDoublyLinkedList::unshift() now returns void instead of true
-  . SplQueue::enqueue() now returns void instead of true
-  . spl_autoload_register() will now always throw a TypeError on invalid
-    arguments, therefore the second argument $do_throw is ignored and a
-    notice will be emitted if it is set to false.
-  . SplFixedArray is now an IteratorAggregate and not an Iterator.
-    SplFixedArray::rewind(), ::current(), ::key(), ::next(), and ::valid()
-    have been removed. In their place, SplFixedArray::getIterator() has been
-    added. Any code which uses explicit iteration over SplFixedArray must now
-    obtain an Iterator through SplFixedArray::getIterator(). This means that
-    SplFixedArray is now safe to use in nested loops.
-
-- Standard:
-  . assert() will no longer evaluate string arguments, instead they will be
-    treated like any other argument. assert($a == $b) should be used instead of
-    assert('$a == $b'). The assert.quiet_eval ini directive and
-    ASSERT_QUIET_EVAL constants have also been removed, as they would no longer
-    have any effect.
-  . parse_str() can no longer be used without specifying a result array.
-  . fgetss() has been removed.
-  . The string.strip_tags filter has been removed.
-  . The needle argument of strpos(), strrpos(), stripos(), strripos(), strstr(),
-    strchr(), strrchr(), and stristr() will now always be interpreted as a
-    string. Previously non-string needles were interpreted as an ASCII code
-    point. An explicit call to chr() can be used to restore the previous
-    behavior.
-  . The needle argument for strpos(), strrpos(), stripos(), strripos(),
-    strstr(), stristr() and strrchr() can now be empty.
-  . The length argument for substr(), substr_count(), substr_compare(), and
-    iconv_substr() can now be null. Null values will behave as if no length
-    argument was provided and will therefore return the remainder of the string
-    instead of an empty string.
-  . The length argument for array_splice() can now be null. Null values will
-    behave identically to omitting the argument, thus removing everything from
-    the 'offset' to the end of the array.
-  . The args argument of vsprintf(), vfprintf(), and vprintf() must now be an
-    array. Previously any type was accepted.
-  . The 'salt' option of password_hash() is no longer supported. If the 'salt'
-    option is used a warning is generated, the provided salt is ignored, and a
-    generated salt is used instead.
-  . The quotemeta() function will now return an empty string if an empty string
-    was passed. Previously false was returned.
-  . hebrevc() has been removed.
-  . convert_cyr_string() has been removed.
-  . money_format() has been removed.
-  . ezmlm_hash() has been removed.
-  . restore_include_path() has been removed.
-  . get_magic_quotes_gpc() and get_magic_quotes_gpc_runtime() has been removed.
-  . FILTER_SANITIZE_MAGIC_QUOTES has been removed.
-  . Calling implode() with parameters in a reverse order ($pieces, $glue) is no
-    longer supported.
-  . parse_url() will now distinguish absent and empty queries and fragments:
-
-        http://example.com/foo   => query = null, fragment = null
-        http://example.com/foo?  => query = "",   fragment = null
-        http://example.com/foo#  => query = null, fragment = ""
-        http://example.com/foo?# => query = "",   fragment = ""
-
-    Previously all cases resulted in query and fragment being null.
-  . var_dump() and debug_zval_dump() will now print floating-point numbers
-    using serialize_precision rather than precision. In a default configuration,
-    this means that floating-point numbers are now printed with full accuracy
-    by these debugging functions.
-  . If the array returned by __sleep() contains non-existing properties, these
-    are now silently ignored. Previously, such properties would have been
-    serialized as if they had the value NULL.
-  . The default locale on startup is now always "C". No locales are inherited
-    from the environment by default. Previously, LC_ALL was set to "C", while
-    LC_CTYPE was inherited from the environment. However, some functions did not
-    respect the inherited locale without an explicit setlocale() call. An
-    explicit setlocale() call is now always required if you wish to change any
-    locale component from the default.
-  . Removed deprecated DES fallback in crypt(). If an unknown salt format is
-    passed to crypt(), the function will fail with *0 instead of falling back
-    to a weak DES hash now.
-  . Specifying out of range rounds for sha256/sha526 crypt() will now fail with
-    *0 instead of clamping to the closest limit. This matches glibc behavior.
-  . The result of sorting functions may have changed, if the array contains
-    elements that compare as equal.
-  . Sort comparison functions that return true or false will now throw a
-    deprecation warning, and should be replaced with an implementation
-    that returns an integer less than, equal to, or greater than zero.
-
-        // Replace
-        usort($array, fn($a, $b) => $a > $b);
-        // With
-        usort($array, fn($a, $b) => $a <=> $b);
-
-  . Any functions accepting callbacks that are not explicitly specified to
-    accept parameters by reference will now warn if a callback with reference
-    parameters is used. Examples include array_filter() and array_reduce().
-    This was already the case for most, but not all, functions previously.
-  . The HTTP stream wrapper as used by functions like file_get_contents()
-    now advertises HTTP/1.1 rather than HTTP/1.0 by default. This does not
-    change the behavior of the client, but may cause servers to respond
-    differently. To retain the old behavior, set the 'protocol_version'
-    stream context option, e.g.
-
-        $ctx = stream_context_create(['http' => ['protocol_version' => '1.0']]);
-        echo file_get_contents('http://example.org', false, $ctx);
-  . Calling crypt() without an explicit salt is no longer supported. If you
-    would like to produce a strong hash with an auto-generated salt, use
-    password_hash() instead.
-  . substr(), mb_substr(), iconv_substr() and grapheme_substr() now consistently
-    clamp out-of-bounds offsets to the string boundary. Previously, false was
-    returned instead of the empty string in some cases.
-
-- Sysvmsg:
-  . msg_get_queue() will now return an SysvMessageQueue object rather than a
-    resource. Return value checks using is_resource() should be replaced with
-    checks for `false`.
-
-- Sysvsem:
-  . sem_get() will now return an SysvSemaphore object rather than a resource.
-    Return value checks using is_resource() should be replaced with checks
-    for `false`.
-  . The $auto_release parameter of sem_get() was changed to accept bool values
-    rather than int.
-
-- Sysvshm:
-  . shm_attach() will now return an SysvSharedMemory object rather than a resource.
-    Return value checks using is_resource() should be replaced with checks
-    for `false`.
-
-- tidy:
-  . The $use_include_path parameter, which was not used internally, has been
-    removed from tidy_repair_string().
-
-- Tokenizer:
-  . T_COMMENT tokens will no longer include a trailing newline. The newline will
-    instead be part of a following T_WHITESPACE token. It should be noted that
-    T_COMMENT is not always followed by whitespace, it may also be followed by
-    T_CLOSE_TAG or end-of-file.
-  . Namespaced names are now represented using the T_NAME_QUALIFIED (Foo\Bar),
-    T_NAME_FULLY_QUALIFIED (\Foo\Bar) and T_NAME_RELATIVE (namespace\Foo\Bar)
-    tokens. T_NS_SEPARATOR is only used for standalone namespace separators,
-    and only syntactially valid in conjunction with group use declarations.
-    RFC: https://wiki.php.net/rfc/namespaced_names_as_token
-
-- XML:
-  . xml_parser_create(_ns) will now return an XmlParser object rather than a
-    resource. Return value checks using is_resource() should be replaced with
-    checks for `false`. The xml_parser_free() function no longer has an effect,
-    instead the XmlParser instance is automatically destroyed if it is no longer
-    referenced.
-
-- XMLWriter:
-  . The XMLWriter functions now accept and return, respectively, XMLWriter
-    objects instead of resources.
-
-- Zip:
-  . ZipArchive::OPSYS_Z_CPM has been removed (this name was a typo). Use
-    ZipArchive::OPSYS_CPM instead.
-
-- Zlib:
-  . gzgetss() has been removed.
-  . inflate_init() will now return an InflateContext object rather than a
-    resource. Return value checks using is_resource() should be replaced with
-    checks for `false`.
-  . deflate_init() will now return a DeflateContext object rather than a
-    resource. Return value checks using is_resource() should be replaced with
-    checks for `false`.
-  . zlib.output_compression is no longer automatically disabled for
-    Content-Type: image/*.
-
 ========================================
 2. New Features
 ========================================
 
-- Core:
-  . Added support for union types.
-    RFC: https://wiki.php.net/rfc/union_types_v2
-  . Added WeakMap.
-    RFC: https://wiki.php.net/rfc/weak_maps
-  . Added ValueError class.
-  . Any number of function parameters may now be replaced by a variadic
-    argument, as long as the types are compatible. For example, the following
-    code is now allowed:
-
-        class A {
-            public function method(int $many, string $parameters, $here) {}
-        }
-        class B extends A {
-            public function method(...$everything) {}
-        }
-  . "static" (as in "late static binding") can now be used as a return type:
-
-        class Test {
-            public function create(): static {
-                return new static();
-            }
-        }
-
-    RFC: https://wiki.php.net/rfc/static_return_type
-  . It is now possible to fetch the class name of an object using
-    `$object::class`. The result is the same as `get_class($object)`.
-    RFC: https://wiki.php.net/rfc/class_name_literal_on_object
-  . New and instanceof can now be used with arbitrary expressions, using
-    `new (expression)(...$args)` and `$obj instanceof (expression)`.
-    RFC: https://wiki.php.net/rfc/variable_syntax_tweaks
-  . Some consistency fixes to variable syntax have been applied, for example
-    writing `Foo::BAR::$baz` is now allowed.
-    RFC: https://wiki.php.net/rfc/variable_syntax_tweaks
-  . Added Stringable interface, which is automatically implemented if a class
-    defines a __toString() method.
-    RFC: https://wiki.php.net/rfc/stringable
-  . Traits can now define abstract private methods.
-    RFC: https://wiki.php.net/rfc/abstract_trait_method_validation
-  . `throw` can now be used as an expression.
-    RFC: https://wiki.php.net/rfc/throw_expression
-  . An optional trailing comma is now allowed in parameter lists.
-    RFC: https://wiki.php.net/rfc/trailing_comma_in_parameter_list
-  . It is now possible to write `catch (Exception)` to catch an exception
-    without storing it in a variable.
-    RFC: https://wiki.php.net/rfc/non-capturing_catches
-  . Added support for mixed type
-    RFC: https://wiki.php.net/rfc/mixed_type_v2
-  . Added support for Attributes
-    RFC: https://wiki.php.net/rfc/attributes_v2
-    RFC: https://wiki.php.net/rfc/attribute_amendments
-    RFC: https://wiki.php.net/rfc/shorter_attribute_syntax
-    RFC: https://wiki.php.net/rfc/shorter_attribute_syntax_change
-  . Added support for constructor property promotion (declaring properties in
-    the constructor signature).
-    RFC: https://wiki.php.net/rfc/constructor_promotion
-  . Added support for `match` expression.
-    RFC: https://wiki.php.net/rfc/match_expression_v2
-  . Private methods declared on a parent class no longer enforce any
-    inheritance rules on the methods of a child class. (with the exception of
-    final private constructors)
-    RFC: https://wiki.php.net/rfc/inheritance_private_methods
-  . Added support for nullsafe operator (`?->`).
-    RFC: https://wiki.php.net/rfc/nullsafe_operator
-  . Added support for named arguments.
-    RFC: https://wiki.php.net/rfc/named_params
-
-- Date:
-  . Added DateTime::createFromInterface() and
-    DateTimeImmutable::createFromInterface().
-  . Added the DateTime format specifier "p" which is the same as "P" but
-    returning "Z" for UTC.
-
-- Dom:
-  . Introduce DOMParentNode and DOMChildNode with new traversal and
-    manipulation APIs.
-    RFC: https://wiki.php.net/rfc/dom_living_standard_api
-
-- Enchant:
-  . enchant_dict_add()
-  . enchant_dict_is_added()
-  . LIBENCHANT_VERSION macro
-
-- FPM:
-  . Added a new option pm.status_listen that allows getting status from
-    different endpoint (e.g. port or UDS file) which is useful for getting
-    status when all children are busy with serving long running requests.
-
-- Hash:
-  . HashContext objects can now be serialized.
-
-- Opcache:
-  . If the opcache.record_warnings ini setting is enabled, opcache will record
-    compile-time warnings and replay them on the next include, even if it is
-    served from cache.
-
-- OpenSSL:
-  . Added Cryptographic Message Syntax (CMS) (RFC 5652) support composed of
-    functions for encryption, decryption, signing, verifying and reading. The
-    API is similar to the API for PKCS #7 functions with an addition of new
-    encoding constants: OPENSSL_ENCODING_DER, OPENSSL_ENCODING_SMIME and
-    OPENSSL_ENCODING_PEM.
-
-- Standard:
-  . printf() and friends now support the %h and %H format specifiers. These
-    are the same as %g and %G, but always use "." as the decimal separator,
-    rather than determining it through the LC_NUMERIC locale.
-  . printf() and friends now support using "*" as width or precision, in which
-    case the width/precision is passed as an argument to printf. This also
-    allows using precision -1 with %g, %G, %h and %H. For example, the following
-    code can be used to reproduce PHP's default floating point formatting:
-
-        printf("%.*H", (int) ini_get("precision"), $float);
-        printf("%.*H", (int) ini_get("serialize_precision"), $float);
-
-  . proc_open() now supports pseudo-terminal (PTY) descriptors. The following
-    attaches stdin, stdout and stderr to the same PTY:
-
-        $proc = proc_open($command, [['pty'], ['pty'], ['pty']], $pipes);
-
-  . proc_open() now supports socket pair descriptors. The following attaches
-    a distinct socket pair to stdin, stdout and stderr:
-
-        $proc = proc_open(
-            $command, [['socket'], ['socket'], ['socket']], $pipes);
-
-    Unlike pipes, sockets do not suffer from blocking I/O issues on Windows.
-    However, not all programs may work correctly with stdio sockets.
-  . Sorting functions are now stable, which means that equal-comparing elements
-    will retain their original order.
-    RFC: https://wiki.php.net/rfc/stable_sorting
-  . array_diff(), array_intersect() and their variations can now be used with
-    a single array as argument. This means that usages like the following are
-    now possible:
-
-        // OK even if $excludes is empty.
-        array_diff($array, ...$excludes);
-        // OK even if $arrays only contains a single array.
-        array_intersect(...$arrays);
-  . The $flag parameter of ob_implicit_flush() was changed to accept bool
-    values rather than int.
-
-- Zip:
-  . Extension updated to version 1.19.1
-  . New ZipArchive::lastId property to get index value of last added entry.
-  . Error can be checked after an archive is closed using ZipArchive::status,
-    ZipArchive::statusSys properties or ZipArchive::getStatusString() method.
-  . The remove_path option of ZipArchive::addGlob() and ::addPattern() is now
-    treated as arbitrary string prefix (for consistency with the add_path
-    option), whereas formerly it was treated as directory name.
-  . Optional compression / encryption features are listed in phpinfo.
-
 ========================================
 3. Changes in SAPI modules
 ========================================
 
-- Apache:
-  . The PHP module has been renamed from php7_module to php_module.
-
-- CGI and FPM will now use CONTEXT_DOCUMENT_ROOT to scan for .user.ini files,
-  if it is defined. Otherwise, DOCUMENT_ROOT will be used as before. This
-  improves support for Apache mod_userdir and mod_alias.
-
 ========================================
 4. Deprecated Functionality
 ========================================
 
-- Core:
-  . Declaring a required parameter after an optional one is deprecated. As an
-    exception, declaring a parameter of the form "Type $param = null" before
-    a required one continues to be allowed, because this pattern was sometimes
-    used to achieve nullable types in older PHP versions.
-
-        function test($a = [], $b) {}       // Deprecated
-        function test(Foo $a = null, $b) {} // Allowed
-  . Calling get_defined_functions() with $exclude_disabled explicitly set to
-    false is deprecated. get_defined_functions() will never include disabled
-    functions.
-
-- Enchant:
-  . enchant_broker_set_dict_path and enchant_broker_get_dict_path
-    not available in libenchant < 1.5 nor in libenchant-2
-  . enchant_dict_add_to_personal, use enchant_dict_add instead
-  . enchant_dict_is_in_session, use enchant_dict_is_added instead
-  . enchant_broker_free and enchant_broker_free_dict, unset the object instead
-  . ENCHANT_MYSPELL and ENCHANT_ISPELL constants
-
-- LibXML:
-  . libxml_disable_entity_loader() has been deprecated. As libxml 2.9.0 is now
-    required, external entity loading is guaranteed to be disabled by default,
-    and this function is no longer needed to protect against XXE attacks.
-
-- PGSQL / PDO PGSQL:
-  . The constant PG_VERSION_STR has now the same value as PG_VERSION, and thus
-    is deprecated.
-  . Function aliases in the pgsql extension have been deprecated.
-
-- Zip:
-  . Using empty file as ZipArchive is deprecated. Libzip 1.6.0
-    do not accept empty files as valid zip archives any longer.
-    Existing workaround will be removed in next version.
-  . The procedural API of Zip is deprecated. Use ZipArchive instead.
-
-- Reflection:
-  . ReflectionFunction::isDisabled() is deprecated, as it is no longer possible
-    to create a ReflectionFunction for a disabled function. This method now
-    always returns false.
-  . ReflectionParameter::getClass(), ReflectionParameter::isArray(), and
-    ReflectionParameter::isCallable() are deprecated.
-    ReflectionParameter::getType() and the ReflectionType APIs should be used
-    instead.
-
 ========================================
 5. Changed Functions
 ========================================
 
-- Reflection:
-  . ReflectionClass::getConstants and ReflectionClass::getReflectionConstants results
-    can be now filtered via a new parameter `$filter`. 3 new constants were added to
-    be used with it:
-
-      ReflectionClassConstant::IS_PUBLIC
-      ReflectionClassConstant::IS_PROTECTED
-      ReflectionClassConstant::IS_PRIVATE
-
-- Zip
- . ZipArchive::addGlob and ZipArchive::addPattern methods accept more
-   values in the "options" array argument:
-   . flags
-   . comp_method
-   . comp_flags
-   . env_method
-   . enc_password
- . ZipArchive::addEmptyDir, ZipArchive::addFile and aZipArchive::addFromString
-   methods have a new "flags" argument. This allows managing name encoding
-   (ZipArchive::FL_ENC_*) and entry replacement (ZipArchive::FL_OVERWRITE)
- . ZipArchive::extractTo now restore file modification time.
-
 ========================================
 6. New Functions
 ========================================
 
-- Core:
-  . Added get_resource_id($resource) function, which returns the same value as
-    (int) $resource. It provides the same functionality under a clearer API.
-
-- LDAP:
-  . Added ldap_count_references(), which returns the number of reference
-    messages in a search result.
-
-- OpenSSL:
-  . Added openssl_cms_encrypt() encrypts the message in the file with the
-    certificates and outputs the result to the supplied file.
-  . Added openssl_cms_decrypt() that decrypts the S/MIME message in the file
-    and outputs the results to the supplied file.
-  . Added openssl_cms_read() that exports the CMS file to an array of PEM
-    certificates.
-  . Added openssl_cms_sign() that signs the MIME message in the file with
-    a cert and key and output the result to the supplied file.
-  . Added openssl_cms_verify() that verifies that the data block is intact,
-    the signer is who they say they are, and returns the certs of the signers.
-
-- PCRE:
-  . Added preg_last_error_msg(), which returns a human-readable message for
-    the last PCRE error. It complements preg_last_error(), which returns an
-    integer enum instead.
-
-- SQLite3:
-  . Add SQLite3::setAuthorizer() and respective class constants to set a
-    userland callback that will be used to authorize or not an action on the
-    database.
-    PR: https://github.com/php/php-src/pull/4797
-
-- Standard:
-  . Added
-
-        str_contains(string $haystack, string $needle): bool
-        str_starts_with(string $haystack, string $needle): bool
-        str_ends_with(string $haystack, string $needle): bool
-
-    functions, which check whether $haystack contains, starts with or ends with
-    $needle.
-    RFC: https://wiki.php.net/rfc/str_contains
-    RFC: https://wiki.php.net/rfc/add_str_starts_with_and_ends_with_functions
-  . Added fdiv() function, which performs a floating-point division under
-    IEEE 754 semantics. Division by zero is considered well-defined and
-    will return one of Inf, -Inf or NaN.
-  . Added get_debug_type() function, which returns a type useful for error
-    messages. Unlike gettype(), it uses canonical type names, returns class
-    names for objects, and indicates the resource type for resources.
-    RFC: https://wiki.php.net/rfc/get_debug_type
-
-- Zip:
-  . ZipArchive::setMtimeName and ZipArchive::setMtimeIndex to set the
-    modification time of an entry.
-  . ZipArchive::setProgressCallback to provide updates during archive close.
-  . ZipArchive::setCancelCallback to allow cancellation during archive close.
-  . ZipArchive::replaceFile to replace an entry content.
-  . ZipArchive::isCompressionMethodSupported to check optional compression
-    features.
-  . ZipArchive::isEncryptionMethodSupported to check optional encryption
-    features.
-
 ========================================
 7. New Classes and Interfaces
 ========================================
 
-- Tokenizer:
-  . The new PhpToken class adds an object-based interface to the tokenizer.
-    It provides a more uniform and ergonomic representation, while being more
-    memory efficient and faster.
-    RFC: https://wiki.php.net/rfc/token_as_object
-
 ========================================
 8. Removed Extensions and SAPIs
 ========================================
 
-- XML-RPC:
-  . The xmlrpc extension has been unbundled and moved to PECL.
-    RFC: https://wiki.php.net/rfc/unbundle_xmlprc
-
 ========================================
 9. Other Changes to Extensions
 ========================================
 
-- CURL:
-  . The CURL extension now requires at least libcurl 7.29.0.
-  . curl_init() will now return a CurlHandle object rather than a resource.
-    Return value checks using is_resource() should be replaced with
-    checks for `false`. The curl_close() function no longer has an effect,
-    instead the CurlHandle instance is automatically destroyed if it is no
-    longer referenced.
-  . curl_multi_init() will now return a CurlMultiHandle object rather than a
-    resource. Return value checks using is_resource() should be replaced with
-    checks for `false`. The curl_multi_close() function no longer has an effect,
-    instead the CurlMultiHandle instance is automatically destroyed if it is no
-    longer referenced.
-  . curl_share_init() will now return a CurlShareHandle object rather than a
-    resource. Return value checks using is_resource() should be replaced with
-    checks for `false`. The curl_share_close() function no longer has an effect,
-    instead the CurlShareHandle instance is automatically destroyed if it is no
-    longer referenced.
-  . The deprecated parameter `$version` of curl_version() has been removed.
-
-- Date:
-  . DatePeriod now implements IteratorAggregate (instead of Traversable).
-
-- DOM:
-  . DOMNamedNodeMap now implements IteratorAggregate (instead of Traversable).
-  . DOMNodeList now implements IteratorAggregate (instead of Traversable).
-
-- Intl:
-  . IntlBreakIterator now implements IteratorAggregate (instead of Traversable).
-  . ResourceBundle now implements IteratorAggregate (instead of Traversable).
-
-- Enchant:
-  . The enchant extension now uses libenchant-2 by default when available.
-    libenchant version 1 is still supported but is deprecated and could
-    be removed in the future.
-
-- GD:
-  . The $num_points parameter of imagepolygon(), imageopenpolygon() and
-    imagefilledpolygon() is now optional, i.e. these functions may be called
-    with either 3 or 4 arguments. If the arguments is omitted, it is calculated
-    as count($points)/2.
-  . The function imagegetinterpolation() to get the current interpolation method
-    has been added.
-
-- JSON:
-  . The JSON extension cannot be disabled anymore and is always an integral part
-    of any PHP build, similar to the date extension.
-
-- MBString:
-  . The Unicode data tables have been updated to version 13.0.0.
-
-- PDO:
-  . PDOStatement now implements IteratorAggregate (instead of Traversable).
-
-- LibXML:
-  . The minimum required libxml version is now 2.9.0. This means that external
-    entity loading is now guaranteed to be disabled by default, and no extra
-    steps need to be taken to protect against XXE attacks.
-
-- MySQLi / PDO MySQL:
-  . When mysqlnd is not used (which is the default and recommended option),
-    the minimum supported libmysqlclient version is now 5.5.
-  . mysqli_result now implements IteratorAggregate (instead of Traversable).
-
-- PGSQL / PDO PGSQL:
-  . The PGSQL and PDO PGSQL extensions now require at least libpq 9.1.
-
-- Readline:
-  . Calling readline_completion_function() before the interactive prompt starts
-    (e.g. in auto_prepend_file) will now override the default interactive prompt
-	completion function. Previously, readline_completion_function() only worked
-	when called after starting the interactive prompt.
-
-- SimpleXML:
-  . SimpleXMLElement now implements RecursiveIterator and absorbed the
-    functionality of SimpleXMLIterator. SimpleXMLIterator is an empty extension
-    of SimpleXMLElement.
-
-- Shmop:
-  . shmop_open() will now return a Shmop object rather than a resource. Return
-    value checks using is_resource() should be replaced with checks for `false`.
-    The shmop_close() function no longer has an effect, and is deprecated;
-    instead the Shmop instance is automatically destroyed if it is no longer
-    referenced.
-
 ========================================
 10. New Global Constants
 ========================================
 
-- Filter:
-  . FILTER_VALIDATE_BOOL has been added as an alias for FILTER_VALIDATE_BOOLEAN.
-    The new name is preferred, as it uses the canonical type name.
-
 ========================================
 11. Changes to INI File Handling
 ========================================
 
-- zend.exception_string_param_max_len
-  . 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
 ========================================
 
-- Standard:
-  . Program execution functions (proc_open(), exec(), popen() etc.) using the
-    shell now consistently execute `%comspec% /s /c "$commandline"`, which has
-    the same effect as executing `$commandline` (without additional quotes).
-
-- GD:
-  . php_gd2.dll has been renamed to php_gd.dll.
-
-- php-test-pack:
-  . The test runner has been renamed from run-test.php to run-tests.php, to
-    match its name in php-src.
-
 ========================================
 13. Other Changes
 ========================================
 
-- EBCDIC targets are no longer supported, though it's unlikely that they were
-  still working in the first place.
-
 ========================================
 14. Performance Improvements
 ========================================
-
-- A Just-In-Time (JIT) compiler has been added to the opcache extension.
-- array_slice() on an array without gaps will no longer scan the whole array to
-  find the start offset. This may significantly reduce the runtime of the
-  function with large offsets and small lengths.
-- strtolower() now uses a SIMD implementation when using the "C" LC_CTYPE
-  locale (which is the default).
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index c15cbef3b1..3e2aeb70a4 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -1,35 +1,8 @@
-PHP 8.0 INTERNALS UPGRADE NOTES
+PHP 8.1 INTERNALS UPGRADE NOTES
 
 1. Internal API changes
-  a. Object Handlers API
-  b. ZEND_OVERLOADED_FUNCTION and corresponding call_method() object handler
-  c. TSRM changes
-  d. get() and set() object handlers
-  e. zend_parse_parameters 'L' specifier
-  f. Arginfo argument types
-  g. zend_free_op type and should_free argument of zend_get_zval_ptr()
-  h. zend_value_error()
-  i. get_closure() object handler
-  j. compare_objects() and compare() object handlers
-  k. The 'I' length modifier
-  l. Some VM instructions switched to IS_TMP_VAR result instead of IS_VAR
-  m. All internal functions must have arginfo
-  n. zend_hash_sort compare function and zend_hash_sort signature change
-  o. cast_object() object handler is now required
-  p. ARG_COUNT() macro removed
-  q. GC_COLLECTABLE flag
-  r. Cannot implement Traversable only
-  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
-  w. Renamed Zend APIs
-  x. ZEND_EXT_NOP no longer emitted
 
 2. Build system changes
-  a. Abstract
-  b. Unix build system changes
-  c. Windows build system changes
 
 3. Module changes
 
@@ -37,425 +10,10 @@ PHP 8.0 INTERNALS UPGRADE NOTES
 1. Internal API changes
 ========================
 
-  a. The Object Handlers API was changed to receive zend_object* instead of
-     zval* and zend_string* instead of zval* for property names. See also
-     section t for other similar changes.
-
-  b. ZEND_OVERLOADED_FUNCTION and corresponding call_method() object handler
-     were removed. ZEND_INTERNAL_FUNCTION with ZEND_ACC_CALL_VIA_HANDLER and
-     defined "handler" callback should be used instead. This "handler" callback
-     should also take care about function cleanup. See ext/zend_test/test.c
-     for example.
-
-  c. The following things have been removed from TSRM:
-      - TSRMLS_DC
-      - TSRMLS_D
-      - TSRMLS_CC
-      - TSRMLS_C
-      - TSRMLS_FETCH
-      - TSRMLS_FETCH_FROM_CTX
-      - TSRMLS_SET_CTX
-      - tsrm_new_interpreter_context
-      - tsrm_set_interpreter_context
-      - tsrm_free_interpreter_context
-      - support for GNUPTH, SGI ST, and BETHREADS
-
-  d. The get() and set() object handlers have been removed. The get() handler
-     can generally be replaced with cast_object(). Some uses of set() may be
-     replaced by do_operation(). If set() was used to overload direct
-     assignments using "=", then this is no longer supported and the
-     functionality should be provided in some other way (for example, as
-     modification of an object property).
-
-  e. The zend_parse_parameters 'L' specifier and the Z_PARAM_STRICT_LONG()
-     family of macros have been removed. Use 'l' and Z_PARAM_LONG() instead,
-     which, despite the confusing name, actually have stricter input validation.
-
-  f. Arginfo argument types for internal functions are no longer checked.
-     Instead type checks should be performed using the zend_parse_parameters()
-     or ZEND_PARSE_PARAMETERS_*() APIs.
-
-  g. The zend_free_op type and the "should_free" and "type" arguments of
-     zend_get_zval_ptr() were removed. It's possible to get the old
-     "should_free" value using the following code:
-
-         zval *ret = zend_get_zval_ptr(
-             opline, opline->op1_type, &opline->op1, execute_data);
-         zval *should_free = (op_type & (IS_TMP_VAR|IS_VAR)) ? ret : NULL;
-
-  h. Added the zend_value_error() function, which is intended to be used
-     to raise ValueError when inappropriate argument values are passed
-     to functions.
-
-  i. get_closure() object handlers now accept an additional zend_bool parameter
-     `check_only`. If it is true, the handler is called to check whether the
-     object is callable; in this case the handler should not throw an exception.
-
-  j. compare_objects() handler was removed. Extensions should use compare() object
-     handler instead and check if both arguments are objects and have the same
-     compare handler, using ZEND_COMPARE_OBJECTS_FALLBACK() macro.
-
-  k. The 'I' length modifier, used to denote 32 and 64bit integer from the custom
-     snprintf and spprintf implementations has been removed.
-     Use the ZEND_LONG_FMT, ZEND_ULONG_FMT and ZEND_XLONG_FMT macros defined in
-     php-src/Zend/zend_long.h
-
-     The 'v' format from the custom snprintf and spprintf implementations has
-     been removed. Use the standard 's' format instead.
-
-  l. Some VM instructions switched to IS_TMP_VAR result instead of IS_VAR.
-     Actually, all assignments (ZEND_ASSIGN, ZEND_ASSIGN_DIM, ZEND_ASSIGN_OBJ,
-     ZEND_ASSIGN_STATIC_PROP), all compound assignments (ZEND_ASSIGN_OP,
-     ZEND_ASSIGN_DIM_OP, ZEND_ASSIGN_OBJ_OP, ZEND_ASSIGN_STATIC_PROP_OP) and all
-     pre increments/decrements (ZEND_PRE_INC, ZEND_PRE_DEC, ZEND_PRE_INC_OBJ
-     ZEND_PRE_DEC_OBJ, ZEND_PRE_INC_STATIC_PROP ZEND_PRE_DEC_STATIC_PROP).
-
-  m. All internal functions and methods are now required to specify arginfo
-     information, otherwise warnings will be thrown on startup.
-
-  n. The zend_hash_sort and zend_hash_minmax APIs now accept a comparison
-     function with the following signature:
-
-         typedef int (*bucket_compare_func_t)(Bucket *a, Bucket *b);
-
-     Previously compare_func_t was used, which accepted void pointers.
-     Furthermore, the return type of zend_hash_sort and zend_ts_hash_sort has
-     been changed from int to void; these functions always succeed.
-
-  o. The cast_object() handler is now required, i.e. must be non-null. You can
-     indicate that casting is not supported by always returning FAILURE.
-
-  p. The ARG_COUNT() macro has been removed use ZEND_NUM_ARGS() instead.
-
-  q. GC_COLLECTABLE flag was inverted into GC_NOT_COLLECTABLE.
-     Assignments to GC_TYPE_INFO() might need to be changed to properly
-     set the value of the GC_NOT_COLLECTABLE flag.
-
-  r. Just for for userland classes, it is no longer allowed to implement only
-     the Traversable interface. Instead, it is necessary to implement either
-     Iterator or IteratorAggregate. You can do the latter by implementing
-     zend_ce_aggregate and providing the following method implementation:
-
-         ZEND_METHOD(MyClass, getIterator) {
-             ZEND_PARSE_PARAMETERS_NONE();
-             zend_create_internal_iterator_zval(return_value, ZEND_THIS);
-         }
-
-  s. The zend_fcall_info no_separation flag has been removed, and separation is
-      never allowed. If you wish to pass (or allow passing) arguments by
-      reference, explicitly create those arguments as references using
-      ZEND_MAKE_REF. This removal also affects call_user_function_ex(), which
-      should be replaced by call_user_function().
-
-  t. The following ZEND_API function have changed signature:
-     1. Void in Zend Engine 4.0:
-        - add_assoc_*()
-        - add_index_*()
-        - add_property_*()
-        - object_init()
-        - zend_declare_class_constant*()
-        - zend_declare_property*()
-        - zend_startup_modules()
-        - zend_wrong_parameters_none_error()
-        - 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()
-        - zend_fcall_info_args_save()
-        - zend_fcall_info_args_restore()
-        - zend_fcall_info_argp()
-        - zend_fcall_info_argv()
-        - zend_fcall_info_argn()
-        - zend_wrong_parameter*()
-        - zend_wrong_callback_error()
-        - zend_parse_arg_class()
-     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:
-        - zend_read_property()
-        - zend_update_property()
-        - zend_unset_property()
-        - zend_call_method()
-        - zend_objects_clone_obj()
-        - zend_get_closure_method_def()
-        - zend_throw_exception_hook()
-        - zend_throw_exception_internal()
-        - 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, request_shutdown_func, and post_deactivate_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()
-     9. Argument void to const char* in Zend Engine 4.0:
-        - zend_get_op_array_extension_handle()
-     10. Argument zend_extension to const char* in Zend Engine 4.0:
-        - zend_get_resource_handle()
-     11. Argument const char * to HMODULE in Zend Engine 4.0:
-        - php_win32_image_compatible()
-     12. const char * argument dropped in Zend Engine 4.0:
-        - php_win32_crt_compatible()
-
-  u. Instead of overwriting zend_error_cb extensions with debugging, monitoring
-     use-cases catching Errors/Exceptions are strongly encouraged to use
-	 the new error observer API instead.
-
-	 Error observering callbacks are guaranteed to be called regardless of
-	 the users error_reporting setting or userland error handler return values.
-
-     Register observer callbacks during MINIT of an extension:
-
-		void my_error_observer_cb(int type,
-			const char *error_filename,
-			uint32_t error_lineno,
-			zend_string *message) {
-		}
-		zend_observer_error_register(my_error_observer_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()
-
-  x. In COMPILE_EXTENDED_STMT mode, a ZEND_EXT_NOP opcode will no longer be
-     generated at the start of a function. Use the new observer APIs or hook
-     into zend_execute_ex instead.
-
 ========================
 2. Build system changes
 ========================
 
-  a. Abstract
-    1.  Symbol HAVE_HASH_EXT is removed and is no longer defined. It should be
-        considered to have hash extension always available since PHP 7.4.
-
-    2.  Symbol HAVE_PCRE is removed and is no longer defined. It should be
-        considered to have pcre extension always available since PHP 7.4.
-
-    3.  Symbol HAVE_LOCALE_H has been removed and is no longer defined.
-
-    4.  --disable-inline-optimization (which actually disabled all compiler
-        optimizations) has been removed. If you wish to build PHP on a host
-        with extremely constrained memory, and compilation fails with an "out
-        of memory" message, add "-O0" to CFLAGS.
-
-    5.  build system and provider are displayed in phpinfo from environment:
-        - PHP_BUILD_SYSTEM (default is same as PHP_UNAME)
-        - PHP_BUILD_PROVIDER (no default)
-
-  b. Unix build system changes
-
-    1.  --enable-maintainer-zts is renamed --enable-zts for parity with Windows
-        and as recognition that ZTS is not a "maintainer" or experimental
-        feature.
-
-    2.  The PHP_CHECK_GCC_ARG() m4 macro has been removed in favor of
-        AX_CHECK_COMPILE_FLAG().
-
-    3. The 6th argument of PHP_ADD_SOURCES_X has been removed.
-
-    4. The 'special-flags' (3rd) argument of PHP_ADD_SOURCES_X are
-       now appended instead of prepended to previous compiler flags.
-       This means compiler flags passed to PHP_NEW_EXTENSION and PHP_ADD_SOURCES
-       are now appended, this allows to disable compiler flags set by Zend/Zend.m4
-       (e.g. disable certain compiler flags enabled by -Wextra)
-
-  c. Windows build system changes
-
-    - The configuration option --enable-crt-debug has been removed. The VC
-      debug heap can now be enabled for debug builds by setting the environment
-      variable PHP_WIN32_DEBUG_HEAP to a non-negative number before PHP process
-      startup.
-
 ========================
 3. Module changes
 ========================
-
diff --git a/Zend/zend.h b/Zend/zend.h
index c10fadd0d0..f5d352cfe4 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.0.0-dev"
+#define ZEND_VERSION "4.1.0-dev"
 
 #define ZEND_ENGINE_3
 
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 9f96d3b0fa..3f330d2a2c 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -44,7 +44,7 @@ You can use the following macro to check the extension API version for compatibi
 
 /* The first number is the engine version and the rest is the date (YYYYMMDD).
  * This way engine 2/3 API no. is always greater than engine 1 API no..  */
-#define ZEND_EXTENSION_API_NO	420200930
+#define ZEND_EXTENSION_API_NO	420201009
 
 typedef struct _zend_extension_version_info {
 	int zend_extension_api_no;
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 30d70bbf53..98957def76 100644
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -31,7 +31,7 @@
 #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module
 #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module
 
-#define ZEND_MODULE_API_NO 20200930
+#define ZEND_MODULE_API_NO 20201009
 #ifdef ZTS
 #define USING_ZTS 1
 #else
diff --git a/configure.ac b/configure.ac
index 58950e0aac..6b33047538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice.
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[8.0.0-dev],[https://bugs.php.net],[php],[https://www.php.net])
+AC_INIT([PHP],[8.1.0-dev],[https://bugs.php.net],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER
diff --git a/main/php.h b/main/php.h
index f796577249..68076befde 100644
--- a/main/php.h
+++ b/main/php.h
@@ -22,7 +22,7 @@
 #include <dmalloc.h>
 #endif
 
-#define PHP_API_VERSION 20200930
+#define PHP_API_VERSION 20201009
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 #define PHP_DEFAULT_CHARSET "UTF-8"
diff --git a/main/php_version.h b/main/php_version.h
index 24765617cb..66d4367856 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -1,8 +1,8 @@
 /* automatically generated by configure */
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 8
-#define PHP_MINOR_VERSION 0
+#define PHP_MINOR_VERSION 1
 #define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "8.0.0-dev"
-#define PHP_VERSION_ID 80000
+#define PHP_VERSION "8.1.0-dev"
+#define PHP_VERSION_ID 80100
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 857e50acbe..d080140d03 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -94,10 +94,10 @@ if (typeof(CWD) == "undefined") {
 
 /* defaults; we pick up the precise versions from configure.ac */
 var PHP_VERSION = 8;
-var PHP_MINOR_VERSION = 0;
+var PHP_MINOR_VERSION = 1;
 var PHP_RELEASE_VERSION = 0;
 var PHP_EXTRA_VERSION = "";
-var PHP_VERSION_STRING = "8.0.0";
+var PHP_VERSION_STRING = "8.1.0";
 
 /* Get version numbers and DEFINE as a string */
 function get_version_numbers()