turkdevops · pull · Sep 22, 2026 · Feb 7, 2026 · Aug 25, 2026 · Aug 10, 2026
diff --git a/.github/matrix.php b/.github/matrix.php
@@ -1,7 +1,8 @@
 <?php
 
 const BRANCHES = [
-    ['name' => 'master', 'ref' => 'master', 'version' => [8, 6]],
+    ['name' => 'master', 'ref' => 'master', 'version' => [8, 7]],
+    ['name' => 'PHP-8.6', 'ref' => 'PHP-8.6', 'version' => [8, 6]],
     ['name' => 'PHP-8.5', 'ref' => 'PHP-8.5', 'version' => [8, 5]],
     ['name' => 'PHP-8.4', 'ref' => 'PHP-8.4', 'version' => [8, 4]],
     ['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => [8, 3]],

diff --git a/.github/scripts/windows/find-target-branch.bat b/.github/scripts/windows/find-target-branch.bat
@@ -3,6 +3,6 @@
 for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
 for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
 
-if /i "%BRANCH%" equ "8.6" (
+if /i "%BRANCH%" equ "8.7" (
 	set BRANCH=master
 )
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,6 +18,7 @@ on:
       - PHP-8.3
       - PHP-8.4
       - PHP-8.5
+      - PHP-8.6
       - master
   pull_request:
     paths-ignore: *ignore_paths

diff --git a/NEWS b/NEWS
diff --git a/UPGRADING b/UPGRADING
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
diff --git a/Zend/zend.h b/Zend/zend.h
@@ -19,7 +19,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.6.0-dev"
+#define ZEND_VERSION "4.7.0-dev"
 
 #define ZEND_ENGINE_3
 

diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
@@ -43,7 +43,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	420250926
+#define ZEND_EXTENSION_API_NO	420260925
 
 typedef struct _zend_extension_version_info {
 	int zend_extension_api_no;

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
@@ -30,7 +30,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 20250926
+#define ZEND_MODULE_API_NO 20260925
 #ifdef ZTS
 #define USING_ZTS 1
 #else

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
@@ -1027,6 +1027,19 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
 #endif
 
+#ifdef ZEND_WIN32
+	switch (php_win32_ioutil_path_kind_a(path, path_length)) {
+		case PHP_WIN32_IOUTIL_PATH_RESERVED:
+			SET_ERRNO_FROM_WIN32_CODE(ERROR_INVALID_NAME);
+			return 1;
+		case PHP_WIN32_IOUTIL_PATH_DEVICE:
+			memcpy(resolved_path, path, path_length + 1);
+			goto verify;
+		default:
+			break;
+	}
+#endif
+
 	/* cwd_length can be 0 when getcwd() fails.
 	 * This can happen under solaris when a dir does not have read permissions
 	 * but *does* have execute permissions */

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
@@ -2522,7 +2522,7 @@ function gen_vm_opcodes_header(
         $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_HYBRID\n";
     }
     if ($GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_HYBRID" || $GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_CALL") {
-        $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)) && defined(__clang__)\n";
+        $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(__aarch64__))\n";
         $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_TAILCALL\n";
         $str .= "#else\n";
         $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_CALL\n";

diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
diff --git a/configure.ac b/configure.ac
@@ -23,7 +23,7 @@ dnl Basic autoconf initialization, generation of config.nice.
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[8.6.0-dev],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
+AC_INIT([PHP],[8.7.0-dev],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_AUX_DIR([build])

diff --git a/docs/release-process.md b/docs/release-process.md
@@ -952,7 +952,6 @@ feature development that cannot go into the new version.
      `Zend/zend.h`, and `win32/build/confutils.js`;
    * update the API version numbers in `Zend/zend_extensions.h`,
      `Zend/zend_modules.h`, and `main/php.h`; and
-   * add the new branch to the list in `CONTRIBUTING.md`.
 
    See [Prepare for PHP 8.2][] and [Prepare for PHP 8.2 (bis)][] for an example
    of what this commit should include.

diff --git a/ext/bz2/tests/gh20807.phpt b/ext/bz2/tests/gh20807.phpt
@@ -12,6 +12,12 @@ if (PHP_OS === 'FreeBSD') die('skip Worker does not handle OOM gracefully');
 if (PHP_OS_FAMILY === 'Darwin') die('skip Too slow');
 if (PHP_INT_SIZE !== 8) die('skip Only for 64-bit systems');
 if (getenv('SKIP_ASAN')) die('skip ASAN makes this test too slow');
+// The decompressed output needs more than 12 GiB of memory at its peak, which
+// takes down smaller machines (e.g. 7 GB CI runners) with the OOM killer.
+$memInfo = @file_get_contents('/proc/meminfo');
+if ($memInfo && preg_match('/MemAvailable:\s+(\d+) kB/', $memInfo, $m) && $m[1] < 13 * 1024 * 1024) {
+    die('skip Insufficient available memory (less than 13 GiB)');
+}
 ?>
 --FILE--
 <?php

diff --git a/ext/intl/collator/collator_attr.cpp b/ext/intl/collator/collator_attr.cpp
@@ -47,6 +47,10 @@ U_CFUNC PHP_FUNCTION( collator_get_attribute )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
+	if (collator_check_initialized(co) == FAILURE) {
+		RETURN_THROWS();
+	}
+
 	value = ucol_getAttribute( co->ucoll, static_cast<UColAttribute>(attribute), COLLATOR_ERROR_CODE_P( co ) );
 	COLLATOR_CHECK_STATUS( co, "Error getting attribute value" );
 
@@ -71,6 +75,10 @@ U_CFUNC PHP_FUNCTION( collator_set_attribute )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
+	if (collator_check_initialized(co) == FAILURE) {
+		RETURN_THROWS();
+	}
+
 	/* Set new value for the given attribute. */
 	ucol_setAttribute( co->ucoll, static_cast<UColAttribute>(attribute), static_cast<UColAttributeValue>(value), COLLATOR_ERROR_CODE_P( co ) );
 	COLLATOR_CHECK_STATUS( co, "Error setting attribute value" );
@@ -94,6 +102,10 @@ U_CFUNC PHP_FUNCTION( collator_get_strength )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
+	if (collator_check_initialized(co) == FAILURE) {
+		RETURN_THROWS();
+	}
+
 	/* Get current strength and return it. */
 	RETURN_LONG( ucol_getStrength( co->ucoll ) );
 }
@@ -116,6 +128,10 @@ U_CFUNC PHP_FUNCTION( collator_set_strength )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
+	if (collator_check_initialized(co) == FAILURE) {
+		RETURN_THROWS();
+	}
+
 	/* Set given strength. */
 	ucol_setStrength( co->ucoll, static_cast<UColAttributeValue>(strength) );
 

diff --git a/ext/intl/collator/collator_class.h b/ext/intl/collator/collator_class.h
@@ -50,6 +50,21 @@ typedef struct {
 #define php_intl_collator_fetch_object(obj) ZEND_CONTAINER_OF(obj, Collator_object, zo)
 #define Z_INTL_COLLATOR_P(zv) php_intl_collator_fetch_object(Z_OBJ_P(zv))
 
+static zend_always_inline zend_result collator_check_initialized(Collator_object *co)
+{
+	ZEND_ASSERT(co != NULL);
+
+	if (UNEXPECTED(co->ucoll == NULL)) {
+		intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) );
+		intl_errors_set_custom_msg(COLLATOR_ERROR_P( co ), "Object not initialized");
+		zend_throw_error(NULL, "Object not initialized");
+
+		return FAILURE;
+	}
+
+	return SUCCESS;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/ext/intl/collator/collator_compare.cpp b/ext/intl/collator/collator_compare.cpp
@@ -55,11 +55,7 @@ U_CFUNC PHP_FUNCTION( collator_compare )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
-	if (!co || !co->ucoll) {
-		intl_error_set_code( NULL, COLLATOR_ERROR_CODE( co ) );
-		intl_errors_set_custom_msg(COLLATOR_ERROR_P( co ), "Object not initialized");
-		zend_throw_error(NULL, "Object not initialized");
-
+	if (collator_check_initialized(co) == FAILURE) {
 		RETURN_THROWS();
 	}
 

diff --git a/ext/intl/collator/collator_locale.cpp b/ext/intl/collator/collator_locale.cpp
@@ -48,11 +48,7 @@ U_CFUNC PHP_FUNCTION( collator_get_locale )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
-	if (!co || !co->ucoll) {
-		intl_error_set_code( nullptr, COLLATOR_ERROR_CODE( co ) );
-		intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), "Object not initialized");
-		zend_throw_error(nullptr, "Object not initialized");
-
+	if (collator_check_initialized(co) == FAILURE) {
 		RETURN_THROWS();
 	}
 

diff --git a/ext/intl/collator/collator_sort.cpp b/ext/intl/collator/collator_sort.cpp
@@ -433,11 +433,7 @@ U_CFUNC PHP_FUNCTION( collator_sort_with_sort_keys )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
-	if (!co || !co->ucoll) {
-		intl_error_set_code( nullptr, COLLATOR_ERROR_CODE( co ) );
-		intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), "Object not initialized");
-		zend_throw_error(NULL, "Object not initialized");
-
+	if (collator_check_initialized(co) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -598,11 +594,7 @@ U_CFUNC PHP_FUNCTION( collator_get_sort_key )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
-	if (!co || !co->ucoll) {
-		intl_error_set_code( nullptr, COLLATOR_ERROR_CODE( co ) );
-		intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), "Object not initialized");
-		zend_throw_error(NULL, "Object not initialized");
-
+	if (collator_check_initialized(co) == FAILURE) {
 		RETURN_THROWS();
 	}
 

diff --git a/ext/intl/tests/collator_attribute_unconstructed.phpt b/ext/intl/tests/collator_attribute_unconstructed.phpt
@@ -0,0 +1,55 @@
+--TEST--
+Collator attribute and strength methods on unconstructed object
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+
+class Collator2 extends Collator {
+    public function __construct() {
+        // omitting parent::__construct($someLocale);
+    }
+}
+
+$c = new Collator2();
+
+$methods = [
+    'getAttribute' => fn() => $c->getAttribute(Collator::NUMERIC_COLLATION),
+    'setAttribute' => fn() => $c->setAttribute(Collator::NUMERIC_COLLATION, Collator::ON),
+    'getStrength' => fn() => $c->getStrength(),
+    'setStrength' => fn() => $c->setStrength(Collator::SECONDARY),
+];
+
+foreach ($methods as $method => $call) {
+    try {
+        $call();
+    } catch (Error $e) {
+        echo $method, ': ', $e::class, ': ', $e->getMessage(), PHP_EOL;
+    }
+}
+
+$functions = [
+    'collator_get_attribute' => fn() => collator_get_attribute($c, Collator::NUMERIC_COLLATION),
+    'collator_set_attribute' => fn() => collator_set_attribute($c, Collator::NUMERIC_COLLATION, Collator::ON),
+    'collator_get_strength' => fn() => collator_get_strength($c),
+    'collator_set_strength' => fn() => collator_set_strength($c, Collator::SECONDARY),
+];
+
+foreach ($functions as $function => $call) {
+    try {
+        $call();
+    } catch (Error $e) {
+        echo $function, ': ', $e::class, ': ', $e->getMessage(), PHP_EOL;
+    }
+}
+
+?>
+--EXPECT--
+getAttribute: Error: Object not initialized
+setAttribute: Error: Object not initialized
+getStrength: Error: Object not initialized
+setStrength: Error: Object not initialized
+collator_get_attribute: Error: Object not initialized
+collator_set_attribute: Error: Object not initialized
+collator_get_strength: Error: Object not initialized
+collator_set_strength: Error: Object not initialized
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ on: @@
           - PHP-8.3
           - PHP-8.4
           - PHP-8.5
+          - PHP-8.6
           - master
       pull_request:
         paths-ignore: *ignore_paths
@@ Expand Down @@