Merge branch 'PHP-8.5' into uri-whatwg-read-fix

Author: TimWolla

.github/scripts/windows/test_task.bat

@@ -36,8 +36,7 @@ if %errorlevel% neq 0 exit /b 3
 rem setup PostgreSQL related exts
 set PGUSER=postgres
 set PGPASSWORD=Password12!
-rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
-echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> "./ext/pgsql/tests/config.inc"
+set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%
 set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
 set TMP_POSTGRESQL_BIN=%PGBIN%
 "%TMP_POSTGRESQL_BIN%\createdb.exe" test

NEWS

@@ -1,19 +1,45 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.5.0RC4
+?? ??? ????, PHP 8.5.0
+
+- Core:
+  . Sync all boost.context files with release 1.86.0. (mvorisek)
+
+- Standard:
+  . Fix memory leak in array_diff() with custom type checks. (ndossche)
+
+- Opcache:
+  . Fixed bug GH-20329 (opcache.file_cache broken with full interned string
+    buffer). (Arnaud)
+
+- URI:
+  . Fixed the distinction between an empty and a missing query/fragment
+    when using Uri\WhatWg\Url::getQuery() and Uri\WhatWg\Url::getFragment().
+    (kocsismate)
+
+06 Nov 2025, PHP 8.5.0RC4
 
 - Core:
   . Fixed bug GH-20270 (Broken parent hook call with named arguments). (ilutov)
   . Fixed bug GH-20183 (Stale EG(opline_before_exception) pointer through eval).
     (ilutov)
   . Fixed bug GH-20194 (null offset deprecation not emitted for writes).
     (Girgias)
+  . Fixed bug GH-GH-20377 (final promoted properties without explicit visibility
+    not automatically assigned). (DanielEScherzer)
 
 - Opcache:
   . Fixed bug GH-20012 (heap buffer overflow in jit). (Arnaud)
   . Partially fixed bug GH-17733 (Avoid calling wrong function when reusing file
     caches across differing environments). (ilutov)
 
+- PCRE:
+  . Downgrade back to PCRE2 10.44, see GH-20341. (nielsdos)
+
+- PgSql:
+  . Fix segfaults when attempting to fetch row into a non-instantiable class
+    name. (Girgias, nielsdos)
+
 - Reflection:
   . Fixed bug GH-20217 (ReflectionClass::isIterable() incorrectly returns true
     for classes with property hooks). (alexandre-daubois)
@@ -32,8 +58,8 @@ PHP                                                                        NEWS
   . Use the "includes credentials" rule of the WHATWG URL Standard to
     decide whether Uri\WhatWg\Url::getUsername() and ::getPassword()
     getters should return null or an empty string. (timwolla)
-  . Fixed the distinction between an empty and a missing query/fragment
-    when using Uri\WhatWg\Url::getQuery() and Uri\WhatWg\Url::getFragment().
+  . Fixed the distinction between empty and missing username/password
+    components of Uri\Rfc3986\Uri.
     (kocsismate)
 
 - Zip:

UPGRADING

@@ -869,9 +869,6 @@ PHP 8.5 UPGRADE NOTES
     URIs and URLs according to RFC 3986 and WHATWG URL.
     RFC: https://wiki.php.net/rfc/url_parsing_api
 
-- PCRE:
-  . Upgraded pcre2lib from 10.44 to 10.46.
-
 - PDO_Sqlite:
   . Increased minimum release version support from 3.7.7 to 3.7.17.
 

Zend/asm/jump_s390x_sysv_elf_gas.S

@@ -49,11 +49,12 @@
 .type	jump_fcontext, @function
 
 #define ARG_OFFSET         0
-#define GR_OFFSET	   16
-#define FP_OFFSET	   96
-#define FPC_OFFSET	   160
-#define PC_OFFSET	   168
-#define CONTEXT_SIZE	   176
+#define GR_OFFSET          16
+#define R14_OFFSET         88
+#define FP_OFFSET          96
+#define FPC_OFFSET         160
+#define PC_OFFSET          168
+#define CONTEXT_SIZE       176
 
 #define REG_SAVE_AREA_SIZE 160
 
@@ -131,11 +132,14 @@ jump_fcontext:
 	ltg	%r2,GR_OFFSET(%r15)
 	jnz	use_return_slot
 
-	/* We restore a make_fcontext context.  Use the function
-	   argument slot in the context we just saved and allocate the
-	   register save area for the target function.  */
-	la	%r2,ARG_OFFSET(%r1)
-	aghi	%r15,-REG_SAVE_AREA_SIZE
+	/* We're restoring a context created by make_fcontext.
+	   This is going to be the argument of the entry point
+	   of the fiber. We're placing it on top of the ABI
+	   defined register save area of the fiber's own stack. */
+	la	%r2,REG_SAVE_AREA_SIZE(%r15)
+
+	/* REG_SAVE_AREA_SIZE + sizeof(transfer_t) */
+	aghi	%r15,-(REG_SAVE_AREA_SIZE+16)
 
 use_return_slot:
 	/* Save the two fields in transfer_t.  When calling a

Zend/asm/jump_sparc64_sysv_elf_gas.S

@@ -6,12 +6,14 @@
 */
 
 /*
- * typedef struct {
- *	void *handle;
- *	zend_fiber_transfer *transfer;
- * } boost_context_data;
+ * typedef void*	fcontext_t;
  *
- * boost_context_data jump_fcontext(void *to, zend_fiber_transfer *transfer);
+ * struct transfer_t {
+ *	fcontext_t	fctx;
+ *	void	*	data;
+ * };
+ *
+ * transfer_t jump_fcontext(fcontext_t const to, void *vp);
  */
 #define CC64FSZ 176
 #define BIAS 2047

Zend/asm/jump_x86_64_ms_pe_gas.S

@@ -89,6 +89,7 @@
 .file	"jump_x86_64_ms_pe_gas.asm"
 .text
 .p2align 4,,15
+.globl	jump_fcontext
 .def	jump_fcontext;	.scl	2;	.type	32;	.endef
 .seh_proc	jump_fcontext
 jump_fcontext:
@@ -203,3 +204,6 @@ jump_fcontext:
     /* indirect jump to context */
     jmp  *%r10
 .seh_endproc
+
+.section .drectve
+.ascii " -export:\"jump_fcontext\""

Zend/asm/make_s390x_sysv_elf_gas.S

@@ -49,12 +49,12 @@
 .type	make_fcontext, @function
 
 #define ARG_OFFSET         0
-#define GR_OFFSET	   16
-#define R14_OFFSET	   88
-#define FP_OFFSET	   96
-#define FPC_OFFSET	   160
-#define PC_OFFSET	   168
-#define CONTEXT_SIZE	   176
+#define GR_OFFSET          16
+#define R14_OFFSET         88
+#define FP_OFFSET          96
+#define FPC_OFFSET         160
+#define PC_OFFSET          168
+#define CONTEXT_SIZE       176
 
 /*
 
@@ -72,7 +72,7 @@ r4 - The address of the context function
 make_fcontext:
 	.machine "z10"
 	/* Align the stack to an 8 byte boundary.  */
-	nill    %r2,0xfff0
+	nill    %r2,0xfff8
 
 	/* Allocate stack space for the context.  */
 	aghi	%r2,-CONTEXT_SIZE

Zend/asm/make_sparc64_sysv_elf_gas.S

@@ -6,7 +6,7 @@
 */
 
 /*
- * void *make_fcontext(void *sp, size_t size, void (*fn)(boost_context_data));
+ * fcontext_t *make_fcontext(void *sp, size_t size, void (*fn)(transfer_t));
  */
 #define CC64FSZ 176
 #define BIAS 2047
@@ -56,7 +56,7 @@ make_fcontext:
 trampoline:
 	ldx	[%sp + BIAS + I7], %l0
 
-	# no need to setup boost_context_data, already in %o0 and %o1
+	# no need to setup transfer_t, already in %o0 and %o1
 	jmpl	%l0, %o7
 	 nop
 

Zend/asm/make_x86_64_ms_pe_gas.S

@@ -89,6 +89,7 @@
 .file	"make_x86_64_ms_pe_gas.asm"
 .text
 .p2align 4,,15
+.globl	make_fcontext
 .def	make_fcontext;	.scl	2;	.type	32;	.endef
 .seh_proc	make_fcontext
 make_fcontext:
@@ -168,3 +169,6 @@ finish:
 .seh_endproc
 
 .def	_exit;	.scl	2;	.type	32;	.endef  /* standard C library function */
+
+.section .drectve
+.ascii " -export:\"make_fcontext\""

Zend/tests/concat/concat_003.phpt

@@ -11,7 +11,7 @@ if (getenv('SKIP_PERF_SENSITIVE')) die("skip performance sensitive test");
 $time = microtime(TRUE);
 
 /* This might vary on Linux/Windows, so the worst case and also count in slow machines. */
-$t_max = 1.0;
+$t_max = 2.0;
 
 $datas = array_fill(0, 220000, [
     '000.000.000.000',