Merge branch 'master' into uri-naming

Author: TimWolla

NEWS

@@ -15,6 +15,16 @@ PHP                                                                        NEWS
   . Added support for configuring the URI parser for the FTP/FTPS as well as
     the SSL/TLS stream wrappers as described in
     https://wiki.php.net/rfc/url_parsing_api#plugability. (kocsismate)
+  . Fixed bug GH-19548 (Shared memory violation on property inheritance).
+    (alexandre-daubois)
+  . Fixed bug GH-19544 (GC treats ZEND_WEAKREF_TAG_MAP references as WeakMap
+    references). (Arnaud, timwolla)
+  . Introduced the TAILCALL VM, enabled by default when compiling with Clang>=19
+    on x86_64 or aarch64. (Arnaud)
+  . Enacted the follow-up phase of the "Path to Saner Increment/Decrement
+    operators" RFC, meaning that incrementing non-numeric strings is now
+    deprecated. (Girgias).
+  . Various closure binding issues are now deprecated. (alexandre-daubois)
 
 - Filter:
   . Added support for configuring the URI parser for FILTER_VALIDATE_URL
@@ -31,6 +41,9 @@ PHP                                                                        NEWS
   . Implement #81724 (openssl_cms_encrypt only allows specific ciphers).
     (Jakub Zelenka)
 
+- Phar:
+  . Fixed memory leaks when verifying OpenSSL signature. (Girgias)
+
 - Session:
   . Added support for partitioned cookies. (nielsdos)
 
@@ -48,6 +61,10 @@ PHP                                                                        NEWS
     (Girgias)
   . Added support for partitioned cookies. (nielsdos)
 
+- Tokenizer:
+  . Fixed bug GH-19507 (Corrupted result after recursive tokenization during
+    token_get_all()). (kubawerlos, nielsdos, Arnaud)
+
 14 Aug 2025, PHP 8.5.0beta1
 
 - Core:

README.md

@@ -55,7 +55,7 @@ sudo dnf install re2c bison autoconf make libtool ccache libxml2-devel sqlite-de
 On MacOS, you can install these using `brew`:
 
 ```shell
-brew install autoconf bison re2c iconv libxml2 sqlite
+brew install autoconf bison re2c libiconv libxml2 sqlite
 ```
 
 or with `MacPorts`:

UPGRADING

@@ -356,6 +356,20 @@ PHP 8.5 UPGRADE NOTES
   . Constant redeclaration is deprecated and that behavior will trigger an
     error in PHP 9.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_constant_redeclaration
+  . Enacted the follow-up phase of the "Path to Saner Increment/Decrement
+    operators" RFC, meaning that incrementing non-numeric strings is now
+    deprecated. Instead the str_increment() function should be used.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#enact_follow-up_phase_of_the_path_to_saner_incrementdecrement_operators_rfc
+  . The following closure binding issues, which already emit an E_WARNING, are
+    now deprecated:
+    - Binding an instance to a static closure
+    - Binding methods to objects that are not instances of the class
+      (or subclass) that the method is defined
+    - Unbinding $this from a method
+    - Unbinding $this from a closure that uses `$this`
+    - Binding a closure to the scope of an internal class
+    - Rebinding the scope of a closure created from a function or method
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_closure_binding_issues
 
 - Curl:
   . The curl_close() function has been deprecated, as CurlHandle objects are
@@ -883,6 +897,11 @@ PHP 8.5 UPGRADE NOTES
   . Creating exception objects is now much faster.
   . The parts of the code that used SSE2 have been adapted to use SIMD
     with ARM NEON as well.
+  . Introduced the TAILCALL VM, enabled by default when compiling with Clang>=19
+    on x86_64 or aarch64. The TAILCALL VM is as fast as the HYBRID VM used when
+    compiling with GCC. This makes PHP binaries built with Clang>=19 as fast as
+    binaries built with GCC. The performance of the CALL VM, used with other
+    compilers, has also improved considerably.
 
 - Intl:
   . Now avoids creating extra string copies when converting strings

Zend/Zend.m4

@@ -170,6 +170,7 @@ ZEND_CHECK_STACK_DIRECTION
 ZEND_CHECK_FLOAT_PRECISION
 ZEND_DLSYM_CHECK
 ZEND_CHECK_GLOBAL_REGISTER_VARIABLES
+ZEND_CHECK_PRESERVE_NONE
 ZEND_CHECK_CPUID_COUNT
 
 AC_MSG_CHECKING([whether to enable thread safety])
@@ -464,3 +465,103 @@ AS_VAR_IF([ZEND_MAX_EXECUTION_TIMERS], [yes],
 AC_MSG_CHECKING([whether to enable Zend max execution timers])
 AC_MSG_RESULT([$ZEND_MAX_EXECUTION_TIMERS])
 ])
+
+dnl
+dnl ZEND_CHECK_PRESERVE_NONE
+dnl
+dnl Check if the preserve_none calling convention is supported and matches our
+dnl expectations.
+dnl
+AC_DEFUN([ZEND_CHECK_PRESERVE_NONE], [dnl
+  AC_CACHE_CHECK([for preserve_none calling convention],
+   [php_cv_preverve_none],
+   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <stdint.h>
+
+const char * const1 = "str1";
+const char * const2 = "str2";
+const char * const3 = "str3";
+uint64_t key = UINT64_C(0x9d7f71d2bd296364);
+
+uintptr_t _a = 0;
+uintptr_t _b = 0;
+
+uintptr_t __attribute__((preserve_none)) fun(uintptr_t a, uintptr_t b) {
+	_a = a;
+	_b = b;
+	return (uintptr_t)const3;
+}
+
+uintptr_t __attribute__((preserve_none)) test(void) {
+	uintptr_t ret;
+
+#if defined(__x86_64__)
+	__asm__ __volatile__(
+		/* XORing to make it unlikely the value exists in any other register */
+		"movq %1, %%r12\n"
+		"xorq %3, %%r12\n"
+		"movq %2, %%r13\n"
+		"xorq %3, %%r13\n"
+		"xorq %%rax, %%rax\n"
+		"call fun\n"
+		: "=a" (ret)
+		: "r" (const1), "r" (const2), "r" (key)
+		: "r12", "r13"
+	);
+#elif defined(__aarch64__)
+	__asm__ __volatile__(
+		/* XORing to make it unlikely the value exists in any other register */
+		"eor    x20, %1, %3\n"
+		"eor    x21, %2, %3\n"
+		"eor    x0, x0, x0\n"
+		"bl     fun\n"
+		"mov    %0, x0\n"
+		: "=r" (ret)
+		: "r" (const1), "r" (const2), "r" (key)
+		: "x0", "x21", "x22", "x30"
+	);
+#else
+# error
+#endif
+
+	return ret;
+}
+
+int main(void) {
+
+	/* JIT is making the following expectations about preserve_none:
+	 * - The registers used for integer args 1 and 2
+	 * - The register used for a single integer return value
+	 *
+	 * We check these expectations here:
+	 */
+
+	uintptr_t ret = test();
+
+	if (_a != ((uintptr_t)const1 ^ key)) {
+		fprintf(stderr, "arg1 mismatch\n");
+		return 1;
+	}
+	if (_b != ((uintptr_t)const2 ^ key)) {
+		fprintf(stderr, "arg2 mismatch\n");
+		return 2;
+	}
+	if (ret != (uintptr_t)const3) {
+		fprintf(stderr, "ret mismatch\n");
+		return 3;
+	}
+
+	fprintf(stderr, "OK\n");
+
+	return 0;
+}]])],
+    [php_cv_preserve_none=yes],
+    [php_cv_preserve_none=no],
+    [php_cv_preserve_none=no])
+  ])
+  AS_VAR_IF([php_cv_preserve_none], [yes], [
+    AC_DEFINE([HAVE_PRESERVE_NONE], [1],
+      [Define to 1 if you have preserve_none support.])
+  ])
+])

Zend/tests/bug70681.phpt

@@ -12,5 +12,5 @@ var_dump($c("foo"));
 
 ?>
 --EXPECTF--
-Warning: Cannot unbind $this of method in %s on line %d
+Warning: Cannot unbind $this of method, this will be an error in PHP 9 in %s on line %d
 int(3)

Zend/tests/bug71300.phpt

@@ -22,7 +22,22 @@ function test2() {
 var_dump(test2());
 ?>
 --EXPECTF--
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
+
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
+
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
+
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
+
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
+
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
+
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
 string(4) "test"
 
+Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in %s on line %d
+
 Warning: Array to string conversion in %s on line %d
 string(9) "Arraytest"

Zend/tests/closures/bug70630.phpt

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

Zend/tests/closures/bug70685.phpt

@@ -15,8 +15,8 @@ var_dump($c);
 
 ?>
 --EXPECTF--
-Warning: Cannot bind method SplDoublyLinkedList::count() to object of class cls in %s on line %d
+Warning: Cannot bind method SplDoublyLinkedList::count() to object of class cls, this will be an error in PHP 9 in %s on line %d
 NULL
 
-Warning: Cannot rebind scope of closure created from method in %s on line %d
+Warning: Cannot rebind scope of closure created from method, this will be an error in PHP 9 in %s on line %d
 NULL

Zend/tests/closures/closure_040.phpt

@@ -36,4 +36,4 @@ $cas->bindTo($a, 'A');
 --EXPECTF--
 Closure::bindTo(): Argument #2 ($newScope) must be of type object|string|null, array given
 
-Warning: Cannot bind an instance to a static closure in %s on line %d
+Warning: Cannot bind an instance to a static closure, this will be an error in PHP 9 in %s on line %d

Zend/tests/closures/closure_041.phpt

@@ -80,16 +80,16 @@ bound: no
 scoped to A: bool(true)
 bound: no
 
-Warning: Cannot unbind $this of closure using $this in %s on line %d
+Warning: Cannot unbind $this of closure using $this, this will be an error in PHP 9 in %s on line %d
 NULL
 
 After binding, with same-class instance for the bound ones
 
-Warning: Cannot bind an instance to a static closure in %s on line %d
+Warning: Cannot bind an instance to a static closure, this will be an error in PHP 9 in %s on line %d
 scoped to A: bool(false)
 bound: A (should be scoped to dummy class)
 
-Warning: Cannot bind an instance to a static closure in %s on line %d
+Warning: Cannot bind an instance to a static closure, this will be an error in PHP 9 in %s on line %d
 scoped to A: bool(true)
 bound: A
 After binding, with different instance for the bound ones