ConnectionMaster · pull · Aug 2, 2021 · Jul 14, 2021 · Jul 14, 2021 · Jul 14, 2021
diff --git a/NEWS b/NEWS
@@ -1,6 +1,51 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.1.0alpha3
+?? ??? ????, PHP 8.1.0beta2
+
+- Core:
+  . Fixed bug #81303 (match error message improvements). (krakjoe)
+
+- Mbstring:
+  . Fixed bug #81298 (mb_detect_encoding() segfaults when 7bit encoding is
+    specified). (Nikita)
+
+- MySQLnd:
+  . Fixed bug #63327 (Crash (Bus Error) in mysqlnd due to wrong alignment).
+    (Nikita)
+
+- Opcache:
+  . Fixed Bug #81255 (Memory leak in PHPUnit with functional JIT)
+  . Fixed Bug #80959 (infinite loop in building cfg during JIT compilation)
+    (Nikita, Dmitry)
+
+- Reflection:
+  . Fixed bug #80821 (ReflectionProperty::getDefaultValue() returns current
+    value for statics). (Nikita)
+  . Fixed bug #80564 (ReflectionProperty::__toString() renders current value,
+    not default value). (Nikita)
+
+22 Jul 2021, PHP 8.1.0beta1
+
+- Core:
+ . Fixed bug #81238 (Fiber support missing for Solaris Sparc). (trowski)
+ . Fixed bug #81237 (Comparison of fake closures doesn't work). (krakjoe)
+
+- Opcache:
+  . Fixed bug #81225 (Wrong result with pow operator with JIT enabled).
+    (Dmitry)
+  . Fixed bug #81249 (Intermittent property assignment failure with JIT
+    enabled). (Dmitry)
+  . Fixed bug #81256 (Assertion `zv != ((void *)0)' failed for "preload" with
+    JIT). (Dmitry)
+
+- Reflection:
+ . Fixed bug #80097 (ReflectionAttribute is not a Reflector). (beberlei)
+
+- Standard:
+ . Fixed bug #81111 (Serialization is unexpectedly allowed on anonymous classes
+   with __serialize()). (Nikita)
+
+08 Jul 2021, PHP 8.1.0alpha3
 
 - Core:
   . Fixed bug #81202 (powerpc64 build fails on fibers). (krakjoe)

diff --git a/UPGRADING b/UPGRADING
@@ -67,15 +67,18 @@ PHP 8.1 UPGRADE NOTES
 
 - Fileinfo:
   . The fileinfo functions now accept and return, respectively, finfo objects
-    instead of resources.
+    instead of resources. Return value checks using is_resource()
+    should be replaced with checks for `false`.
 
 - FTP:
   . The FTP functions now accept and return, respectively, FTP\Connection objects
-    instead of resources.
+    instead of resources. Return value checks using is_resource()
+    should be replaced with checks for `false`.
 
 - IMAP:
   . The IMAP functions now accept and return, respectively, IMAP\Connection objects
-    instead of resources.
+    instead of resources. Return value checks using is_resource()
+    should be replaced with checks for `false`.
 
 - LDAP:
   . The LDAP functions now accept and return, respectively, LDAP\Connection objects
@@ -139,6 +142,10 @@ PHP 8.1 UPGRADE NOTES
     objects instead of "pgsql large object" resources. Return value checks
     using is_resource() should be replaced with checks for `false`.
 
+- Phar:
+  . To comply with the ArrayAccess interface, Phar::offsetUnset() and
+    PharData::offsetUnset() no longer return a boolean.
+
 - PSpell:
   . The PSpell functions now accept and return, respectively, PSpell\Dictionary objects
     instead of "pspell" resources. Return value checks using is_resource()
@@ -160,12 +167,8 @@ PHP 8.1 UPGRADE NOTES
     reference representation since PHP 7.0.
   . debug_zval_dump() will not print "interned" instead of a dummy refcount of
     one for interned strings and immutable arrays.
-  . fputcsv() now accepts a new "eol" argument which allow to define a custom
-    eol sequence, the default remains the same and is "\n".
 
 - SPL:
-  . SplFileObject::fputcsv() now accepts a new "eol" argument which allow to
-    define a custom eol sequence, the default remains the same and is "\n".
   . SplFixedArray will now be JSON encoded like an array.
 
 ========================================
@@ -185,11 +188,26 @@ PHP 8.1 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/noreturn_type
   . Added support for fibers.
     RFC: https://wiki.php.net/rfc/fibers
+  . It is now possible to use "new ClassName()" expressions as parameter
+    default values, static variable and global constant initializers, as well
+    as attribute arguments. Objects can also be passed to `define()` now.
+    RFC: https://wiki.php.net/rfc/new_in_initializers
+  . Closures for callables can now be created using the syntax `myFunc(...)`,
+    which is the same as `Closure::fromCallable('myFunc')`. Yes, the `...` is
+    part of the syntax, not an omission.
+    RFC: https://wiki.php.net/rfc/first_class_callable_syntax
   . File uploads now provide an additional full_path key, which contains the
     full path (rather than just the basename) of the uploaded file. This is
     intended for use in conjunction with "upload webkitdirectory".
   . It is now allowed to specify named arguments after an argument unpack, e.g.
     foo(...$args, named: $arg).
+  . Added support for intersection types.
+    They cannot be combined with union types.
+    RFC: https://wiki.php.net/rfc/pure-intersection-types
+  . Added support for the final modifier for class constants.
+    RFC: https://wiki.php.net/rfc/final_class_const
+  . Added support for readonly properties.
+    RFC: https://wiki.php.net/rfc/readonly_properties_v2
 
 - Curl:
   . Added CURLOPT_DOH_URL option.
@@ -222,7 +240,7 @@ PHP 8.1 UPGRADE NOTES
     imageavif() functions, if libgd has been built with avif support.
 
 - hash:
-  . The following functions have changed signatures:
+  . The following functions have changed signatures, to support an optional `$options` argument:
 
     - function hash(string $algo, string $data, bool $binary = false, array $options = []): string|false {}
     - function hash_file(string $algo, string $filename, bool $binary = false, array $options = []): string|false {}
@@ -277,7 +295,7 @@ PHP 8.1 UPGRADE NOTES
   . Binding in execute has been added to mysqli prepared statements.
     Parameters can now be passed to mysqli_stmt::execute as an array.
     RFC: https://wiki.php.net/rfc/mysqli_bind_in_execute
-  . A new function has been added to mysqli_result called mysqli_fetch_column().
+  . A new method has been added to mysqli_result called mysqli_fetch_column().
     It allows for fetching single scalar values from the result set.
     RFC: https://wiki.php.net/rfc/mysqli_fetch_column
 
@@ -298,6 +316,14 @@ PHP 8.1 UPGRADE NOTES
   . Added POSIX_RLIMIT_KQUEUES and POSIX_RLIMIT_NPTS. These rlimits are only
     available on FreeBSD.
 
+- Standard:
+  . fputcsv() now accepts a new "eol" argument which allow to define a custom
+    eol sequence, the default remains the same and is "\n".
+
+- SPL:
+  . SplFileObject::fputcsv() now accepts a new "eol" argument which allow to
+    define a custom eol sequence, the default remains the same and is "\n".
+
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -307,7 +333,7 @@ PHP 8.1 UPGRADE NOTES
     Previously, -a without readline had the same behavior as calling php without
     any arguments, apart from printing an additional "Interactive mode enabled"
     message. This mode was not, in fact, interactive.
-    
+
 - phpdbg:
   . Remote functionality from phpdbg has been removed.
 
@@ -325,7 +351,63 @@ PHP 8.1 UPGRADE NOTES
     e.g. a truncation from 1.9 to 1, is deprecated. This affects array keys,
     int parameter and return types, and operators working on integers.
     RFC: https://wiki.php.net/rfc/implicit-float-int-deprecate
-  . returning a non-array from __sleep will raise a warning
+  . Calling a static method or accessing a static property directly on a trait
+    is deprecated. Static methods and properties should only be accessed on a
+    class using the trait.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+  . Returning a non-array from __sleep will raise a warning
+  . Returning by reference from a void function is deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+  . Automatic conversion of "false" into an empty array on write operands is
+    deprecated.
+    RFC: https://wiki.php.net/rfc/autovivification_false
+
+- Ctype:
+  . Passing a non-string value to ctype_*() functions is deprecated. A future
+    version of PHP will make ctype_*() accept a string argument, which means
+    that either only strings will be accepted (strict_types=1) or inputs may be
+    converted to string (strict_types=0). In particular, using ctype_*($cp) to
+    check whether an ASCII codepoint given as integer satisfies a given ctype
+    predicate will no longer be supported. Instead ctype_*(chr($cp)) should be
+    used.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- Date:
+  . The date_sunrise() and date_sunset() functions have been deprecated in
+    favor of date_sun_info().
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+  . The strftime() and gmstrftime() functions have been deprecated in favor of
+    date()/DateTime::format() (for locale-independent formatting) or
+    IntlDateFormatter::format() (for locale-dependent formatting).
+
+- Filter:
+  . The FILTER_SANITIZE_STRING and FILTER_SANITIZE_STRIPPED filters have been
+    deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+  . The filter.default ini setting is deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- GD:
+  . The $num_points parameter of image(open|filled)polygon has been deprecated.
+
+- Hash:
+  . The mhash(), mhash_keygen_s2k(), mhash_count(), mhash_get_block_size() and
+    mhash_get_hash_name() functions are deprecated. Use the hash_*() APIs
+    instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- IMAP:
+  . The NIL constant has been deprecated. Use 0 instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- Intl:
+  . Calling IntlCalendar::roll() with bool argument is deprecated. Pass 1 and -1
+    instead of true and false respectively.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- Mbstring:
+  . Calling mb_check_encoding() without an argument is deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
 
 - MySQLi:
   . The mysqli_driver::$driver_version property has been deprecated. The driver
@@ -335,11 +417,49 @@ PHP 8.1 UPGRADE NOTES
     mysqli_get_client_info() function has been deprecated. Use
     mysqli_get_client_info() without any arguments to obtain the client
     library version information.
+  . The mysqli::init() method has been deprecated. Replace calls to
+    parent::init() with parent::__construct().
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- OCI8:
+  . The INI directive oci8.old_oci_close_semantics has been deprecated.
+
+- ODBC:
+  . odbc_result_all() has been deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
 
 - PDO:
   . The PDO::FETCH_SERIALIZE mode has been deprecated.
     RFC: https://wiki.php.net/rfc/phase_out_serializable
 
+- PgSQL:
+  . Not passing the connection argument to PgSQL functions and using the
+    default connection is deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- SOAP:
+  . The ssl_method option for the SoapClient constructor has been deprecated in
+    favor of ssl stream context options. The direct equivalent would be
+    crypto_method, but min_proto_version/max_proto_version are recommended
+    instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
+- Standard:
+  . Calling key(), current(), next(), prev(), reset(), or end() on objects
+    is deprecated. Instead cast the object to array first, or make use of
+    ArrayIterator.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+  . The strptime() function has been deprecated. Use date_parse_from_format()
+    instead (for locale-independent parsing) or IntlDateFormatter::parse() (for
+    locale-dependent parsing).
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+  . The auto_detect_line_endings ini setting has been deprecated. If necessary,
+    handle "\r" line breaks manually instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+  . The FILE_BINARY and FILE_TEXT constants are deprecated. They already had
+    no effect previously.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_1
+
 ========================================
 5. Changed Functions
 ========================================
@@ -366,6 +486,15 @@ PHP 8.1 UPGRADE NOTES
   . PDO::getAttributes() with PDO::ATTR_SERVER_INFO and PDO::ATTR_SERVER_VERSION
     now return values instead of throwing PDOException.
 
+- Reflection:
+  . ReflectionProperty::setAccessible() and ReflectionMethod::setAccessible()
+    no longer have an effect. Properties and methods are always considered
+    accessible through reflection.
+    RFC: https://wiki.php.net/rfc/make-reflection-setaccessible-no-op
+
+- Standard:
+  . syslog() is now binary safe.
+
 ========================================
 6. New Functions
 ========================================
@@ -436,9 +565,6 @@ PHP 8.1 UPGRADE NOTES
 - OpenSSL:
   . The OpenSSL extension now requires at least OpenSSL version 1.0.2.
 
-- Sockets:
-  . FreeBSD defines SO_ACCEPTFILTER
-
 - Standard:
   . --with-password-argon2 now uses pkg-config to detect libargon2. As such,
     an alternative libargon2 location should now be specified using
@@ -453,9 +579,14 @@ PHP 8.1 UPGRADE NOTES
     MYSQLI_REFRESH_SLAVE, in line with an upstream change in MySQL. The old
     constant is still available for backwards-compatibility reasons, but may
     be deprecated/removed in the future.
-    
+
 - Sockets:
-  . TCP_DEFER_ACCEPT socket option added where available.
+  . The following socket options are now defined if they are supported:
+     * SO_ACCEPTFILTER
+     * SO_DONTTRUNC
+     * SO_WANTMORE
+     * SO_MARK
+     * TCP_DEFER_ACCEPT
 
 ========================================
 11. Changes to INI File Handling
@@ -468,8 +599,6 @@ PHP 8.1 UPGRADE NOTES
 12. Windows Support
 ========================================
 
-. The macro IGNORE_URL_WIN has been removed; it had no effect as of PHP 5.0.0.
-
 ========================================
 13. Other Changes
 ========================================

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
@@ -4,6 +4,11 @@ PHP 8.1 INTERNALS UPGRADE NOTES
   a. Removed Zend APIs
   b. Zend Stream API
   c. zend_get_opcode_id()
+  d. Removed support for "p" printf format specifier
+  e. ZEND_ATOL() changes
+  f. Non-serializable classes should use ZEND_ACC_NOT_SERIALIZABLE
+  g. _zend_hash_find_known_hash renamed to zend_hash_find_known_hash
+  h. Renaming of ZEND_TYPE_HAS_CLASS() into ZEND_TYPE_IS_COMPLEX()
 
 2. Build system changes
   a. New compiler flags
@@ -25,6 +30,7 @@ PHP 8.1 INTERNALS UPGRADE NOTES
        zend_ce_traversable.
      - The ZVAL_NEW_ARR() macro has been removed. Use array_init() or ZVAL_ARR
        with zend_new_array() instead.
+     - The IGNORE_URL_WIN macro has been removed; it had no effect as of PHP 5.0.0.
   b. Zend Stream API has been changed to use "zend_string*" instead of "char*"
       - zend_file_handle.filename now is zend_string*
       - zend_file_handle.free_filename is removed. Now zend_file_handle.filename is always released.
@@ -42,6 +48,15 @@ PHP 8.1 INTERNALS UPGRADE NOTES
   c. Added the zend_get_opcode_id() function, which is intended to get opcode id from name.
   d. Removed support for "p" modifier (%pd, %pu, etc) in PHP's printf
      implementations. Use ZEND_LONG_FMT and ZEND_ULONG_FMT instead.
+  e. ZEND_ATOL() now returns the integer instead of assigning it as part of the
+     macro. Replace ZEND_ATOL(i, s) with i = ZEND_ATOL(s).
+  f. Non-serializable classes should be indicated using the
+     ZEND_ACC_NOT_SERIALIZABLE (@not-serializable in stubs) rather than the
+     zend_class_(un)serialize_deny handlers which are removed.
+  g. _zend_hash_find_known_hash has been renamed to zend_hash_find_known_hash.
+  h. ZEND_TYPE_HAS_CLASS() has been renamed to ZEND_TYPE_IS_COMPLEX() for clarity.
+     A zend_type element can contain a zend_type_list which might be either a union or an intersection,
+     or a single class stored as either a zend_string* or a zend_class_entry*.
 
 ========================
 2. Build system changes

diff --git a/Zend/Makefile.frag b/Zend/Makefile.frag
@@ -32,7 +32,13 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
 	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
 
-$(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.c: $(srcdir)/zend_vm_def.h $(srcdir)/zend_vm_execute.skl $(srcdir)/zend_vm_gen.php
+# Use an intermediate target to indicate that zend_vm_gen.php produces both files
+# at the same time, rather than the same recipe applying for two different targets.
+# The "grouped targets" feature, which would solve this directly, is only available
+# since GNU Make 4.3.
+$(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.c: vm.gen.intermediate ;
+.INTERMEDIATE: vm.gen.intermediate
+vm.gen.intermediate: $(srcdir)/zend_vm_def.h $(srcdir)/zend_vm_execute.skl $(srcdir)/zend_vm_gen.php
 	@if test ! -z "$(PHP)"; then \
 		$(PHP) $(srcdir)/zend_vm_gen.php; \
 	fi;

diff --git a/Zend/Optimizer/compact_literals.c b/Zend/Optimizer/compact_literals.c
@@ -73,7 +73,7 @@ static size_t type_num_classes(const zend_op_array *op_array, uint32_t arg_num)
 		arg_info = op_array->arg_info - 1;
 	}
 
-	if (ZEND_TYPE_HAS_CLASS(arg_info->type)) {
+	if (ZEND_TYPE_IS_COMPLEX(arg_info->type)) {
 		if (ZEND_TYPE_HAS_LIST(arg_info->type)) {
 			return ZEND_TYPE_LIST(arg_info->type)->num_types;
 		}