Merge pull request #9 from php/master

sync

Author: chopins

.travis.yml

@@ -70,8 +70,10 @@ jobs:
     include:
         - env: ENABLE_ZTS=0 ENABLE_DEBUG=0
           arch: amd64
+          if: type = cron
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1
           arch: amd64
+          if: type = cron
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
           arch: arm64
           if: type = cron

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.0alpha1
 
+- Core:
+  . Fixed inclusion order for phpize builds on Windows. (cmb)
+  . Added missing hashtable insertion APIs for arr/obj/ref. (Sara)
+
 - FTP:
   . Convert resource<ftp> to object \FTPConnection. (Sara)
 

UPGRADING

@@ -19,17 +19,49 @@ PHP 8.1 UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================
 
+- MySQLi:
+  . mysqli_fetch_fields() and mysqli_fetch_field_direct() will now always return
+    zero for max_length. You can compute this information by iterating over the
+    result set and taking the maximum length. This is what PHP was doing
+    internally previously.
+  . The MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH option no longer has an effect.
+  . The MYSQLI_STORE_RESULT_COPY_DATA option no longer has an effect.
+
+- MySQLnd:
+  . The mysqlnd.fetch_copy_data ini setting has been removed. However, this
+    should not result in user-visible behavior changes.
+
+- Standard:
+  . version_compare() no longer accepts undocumented operator abbreviations.
+
 ========================================
 2. New Features
 ========================================
 
 - hash:
-  . Added MurmurHash3 with streaming support. The following variants are implemented
+  . The following functions have changed signatures:
+
+    - 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 {}
+    - function hash_init(string $algo, int $flags = 0, string $key = "", array $options = []): HashContext {}
+
+    The additional `$options` argument can be used to pass algorithm specific data.
+
+  . Added MurmurHash3 with streaming support. The following variants are implemented:
 
     - murmur3a, 32-bit hash
     - murmur3c, 128-bit hash for x86
     - murmur3f, 128-bit hash for x64
 
+    The initial hash state can be passed through the `seed` key in the `$options` array, for example:
+
+    ```php
+    $h = hash("murmur3f", $data, options: ["seed" => 42]);
+    echo $h, "\n";
+    ```
+
+    A valid seed value is within the range from 0 to the plaform defined UINT_MAX, usually 4294967295.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -61,6 +93,11 @@ PHP 8.1 UPGRADE NOTES
 - OpenSSL:
   . The OpenSSL extension now requires at least OpenSSL version 1.0.2.
 
+- Standard:
+  . --with-password-argon2 now uses pkg-config to detect libargon2. As such,
+    an alternative libargon2 location should now be specified using
+    PKG_CONFIG_PATH.
+
 ========================================
 10. New Global Constants
 ========================================

UPGRADING.INTERNALS

@@ -5,6 +5,7 @@ PHP 8.1 INTERNALS UPGRADE NOTES
 2. Build system changes
 
 3. Module changes
+  a. ext/hash
 
 ========================
 1. Internal API changes
@@ -17,3 +18,10 @@ PHP 8.1 INTERNALS UPGRADE NOTES
 ========================
 3. Module changes
 ========================
+
+  a. ext/hash
+    - The init signatures are extended with an additional `HashTable*`
+      argument. The passed HT is to contain the algorithm specific
+      configuration. If the an algorithm doesn't make use of any
+      additional configuration, the argument is to be marked with
+      ZEND_ATTRIBUTE_UNUSED.

Zend/Zend.m4

@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS
 dnl
 AC_DEFUN([LIBZEND_OTHER_CHECKS],[
 
-AC_ARG_ENABLE([zts],
-  [AS_HELP_STRING([--enable-zts],
-    [Enable thread safety])],
-  [ZEND_ZTS=$enableval],
-  [ZEND_ZTS=no])
-
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_ZTS)
 

Zend/tests/attributes/032_attribute_validation_scope.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Validation for "Attribute" does not use a scope when evaluating constant ASTs
+--FILE--
+<?php
+#[Attribute(parent::x)]
+class x extends y {}
+?>
+--EXPECTF--
+Fatal error: Cannot access "parent" when no class scope is active in %s on line %d

Zend/tests/bug70630.phpt

@@ -7,4 +7,4 @@ $x = (new ReflectionFunction("substr"))->getClosure();
 $x->call(new a);
 ?>
 --EXPECTF--
-Warning: Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure() in %s on line %d
+Warning: Cannot rebind scope of closure created from function in %s on line %d

Zend/tests/bug70685.phpt

@@ -18,5 +18,5 @@ var_dump($c);
 Warning: Cannot bind method SplDoublyLinkedList::count() to object of class cls in %s on line %d
 NULL
 
-Warning: Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure() in %s on line %d
+Warning: Cannot rebind scope of closure created from method in %s on line %d
 NULL

Zend/tests/bug80391.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Iterable not covariant to mixed
+--FILE--
+<?php
+
+class A {
+    public function method1(): mixed {}
+    public function method2(): array|object {}
+    public function method3(iterable $x) {}
+    public function method4(iterable $x) {}
+}
+
+class B extends A {
+    public function method1(): iterable {}
+    public function method2(): iterable {}
+    public function method3(mixed $x) {}
+    public function method4(array|object $x) {}
+}
+
+?>
+===DONE===
+--EXPECT--
+===DONE===

Zend/tests/bug80404.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Bug #80404: Incorrect range inference result when division results in float
+--FILE--
+<?php
+
+$n = 63;
+var_dump((int) ($n / 120 * 100));
+
+?>
+--EXPECT--
+int(52)