Merge branch 'master' - merge PCRE 10.44 downgrade

Author: mvorisek

.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

CODING_STANDARDS.md

@@ -276,7 +276,7 @@ rewritten to comply with these rules.
 
 1. The length of constant string literals should be calculated via ``strlen()``
    instead of using ``sizeof()-1`` as it is clearer and any modern compiler
-   will optimize it away. Legacy usages of the latter style exists within the
+   will optimize it away. Legacy usages of the latter style exist within the
    codebase but should not be refactored, unless larger refactoring around that
    code is taking place.
 

NEWS

@@ -33,8 +33,14 @@ PHP                                                                        NEWS
   . Fixed bug GH-19926 (reset internal pointer earlier while splicing array
     while COW violation flag is still set). (alexandre-daubois)
 
+- Streams:
+  . Added so_reuseaddr streams context socket option that allows disabling
+    address resuse.
+
 - Zip:
   . Fixed ZipArchive callback being called after executor has shut down.
     (ilutov)
+  . Support minimum version for libzip dependency updated to 1.0.0.
+    (David Carlier)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -36,6 +36,12 @@ PHP 8.6 UPGRADE NOTES
     IntlNumberRangeFormatter::IDENTITY_FALLBACK_SINGLE_VALUE, IntlNumberRangeFormatter::IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE, IntlNumberRangeFormatter::IDENTITY_FALLBACK_APPROXIMATELY and
     IntlNumberRangeFormatter::IDENTITY_FALLBACK_RANGE identity fallbacks.
     It is supported from icu 63.
+
+- Streams:
+  . Added stream socket context option so_reuseaddr that allows disabling
+    address reuse (SO_REUSEADDR) and explicitly uses SO_EXCLUSIVEADDRUSE on
+    Windows.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -111,5 +117,11 @@ PHP 8.6 UPGRADE NOTES
   . Arguments are now passed more efficiently to known constructors (e.g. when
     using new self()).
 
+- DOM:
+  . Made splitText() faster and consume less memory.
+
 - JSON:
   . Improve performance of encoding arrays and objects.
+
+- Standard:
+  . Improved performance of array_fill_keys().

Zend/tests/ctor_promotion/ctor_promotion_final.phpt

@@ -0,0 +1,23 @@
+--TEST--
+GH-20377: Constructor promotion with a final property without visibility set
+--FILE--
+<?php
+
+class Demo {
+    public function __construct(
+        final string $foo,
+        final public string $bar,
+    ) {}
+}
+
+$d = new Demo("first", "second");
+var_dump($d);
+
+?>
+--EXPECTF--
+object(Demo)#%d (2) {
+  ["foo"]=>
+  string(5) "first"
+  ["bar"]=>
+  string(6) "second"
+}

Zend/zend_compile.c

@@ -7864,6 +7864,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
 		}
 	}
 
+	const uint32_t promotion_flags = ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY | ZEND_ACC_FINAL;
 	for (i = 0; i < list->children; ++i) {
 		zend_ast *param_ast = list->child[i];
 		zend_ast *type_ast = param_ast->child[0];
@@ -7875,7 +7876,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
 		zend_string *name = zval_make_interned_string(zend_ast_get_zval(var_ast));
 		bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0;
 		bool is_variadic = (param_ast->attr & ZEND_PARAM_VARIADIC) != 0;
-		uint32_t property_flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY | ZEND_ACC_FINAL);
+		uint32_t property_flags = param_ast->attr & promotion_flags;
 		bool is_promoted = property_flags || hooks_ast;
 
 		CG(zend_lineno) = param_ast->lineno;
@@ -8102,7 +8103,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32
 		zend_ast *param_ast = list->child[i];
 		zend_ast *hooks_ast = param_ast->child[5];
 		bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0;
-		uint32_t flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_PPP_SET_MASK | ZEND_ACC_READONLY);
+		uint32_t flags = param_ast->attr & promotion_flags;
 		bool is_promoted = flags || hooks_ast;
 		if (!is_promoted) {
 			continue;

Zend/zend_hash.h

@@ -473,6 +473,17 @@ static zend_always_inline bool zend_hash_str_exists_ind(const HashTable *ht, con
 			Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF);
 }
 
+static zend_always_inline zval *zend_symtable_add(HashTable *ht, zend_string *key, zval *pData)
+{
+	zend_ulong idx;
+
+	if (ZEND_HANDLE_NUMERIC(key, idx)) {
+		return zend_hash_index_add(ht, idx, pData);
+	} else {
+		return zend_hash_add(ht, key, pData);
+	}
+}
+
 static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string *key, zval *pData)
 {
 	zend_ulong idx;

ext/dom/text.c

@@ -96,7 +96,6 @@ Modern spec URL: https://dom.spec.whatwg.org/#dom-text-splittext
 */
 PHP_METHOD(DOMText, splitText)
 {
-	zval       *id;
 	xmlChar    *first;
 	xmlChar    *second;
 	xmlNodePtr  node;
@@ -105,11 +104,10 @@ PHP_METHOD(DOMText, splitText)
 	int         length;
 	dom_object	*intern;
 
-	id = ZEND_THIS;
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &offset) == FAILURE) {
 		RETURN_THROWS();
 	}
-	DOM_GET_OBJ(node, id, xmlNodePtr, intern);
+	DOM_GET_OBJ(node, ZEND_THIS, xmlNodePtr, intern);
 
 	if (offset < 0) {
 		zend_argument_value_error(1, "must be greater than or equal to 0");
@@ -129,17 +127,18 @@ PHP_METHOD(DOMText, splitText)
 	first = xmlUTF8Strndup(cur, (int)offset);
 	second = xmlUTF8Strsub(cur, (int)offset, (int)(length - offset));
 
-	xmlNodeSetContent(node, first);
-	nnode = xmlNewDocText(node->doc, second);
-
-	xmlFree(first);
-	xmlFree(second);
+	xmlNodeSetContent(node, NULL);
+	node->content = first;
+	nnode = xmlNewDocText(node->doc, NULL);
 
 	if (nnode == NULL) {
+		xmlFree(second);
 		php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
 		RETURN_THROWS();
 	}
 
+	nnode->content = second;
+
 	if (node->parent != NULL) {
 		nnode->type = XML_ELEMENT_NODE;
 		xmlAddNextSibling(node, nnode);
@@ -155,21 +154,11 @@ Since: DOM Level 3
 */
 PHP_METHOD(DOMText, isWhitespaceInElementContent)
 {
-	zval       *id;
 	xmlNodePtr  node;
 	dom_object	*intern;
-
-	id = ZEND_THIS;
-	if (zend_parse_parameters_none() == FAILURE) {
-		RETURN_THROWS();
-	}
-	DOM_GET_OBJ(node, id, xmlNodePtr, intern);
-
-	if (xmlIsBlankNode(node)) {
-		RETURN_TRUE;
-	} else {
-		RETURN_FALSE;
-	}
+	ZEND_PARSE_PARAMETERS_NONE();
+	DOM_GET_OBJ(node, ZEND_THIS, xmlNodePtr, intern);
+	RETURN_BOOL(xmlIsBlankNode(node));
 }
 /* }}} end dom_text_is_whitespace_in_element_content */
 

ext/intl/collator/collator_attr.c ext/intl/collator/collator_attr.cppext/intl/collator/collator_attr.c renamed to ext/intl/collator/collator_attr.cpp

@@ -17,14 +17,21 @@
 #include <config.h>
 #endif
 
+#if __cplusplus >= 201703L
+#include <string_view>
+#include <unicode/unistr.h>
+#endif
+
+extern "C" {
 #include "php_intl.h"
+}
 #include "collator_class.h"
 #include "collator_convert.h"
 
 #include <unicode/ustring.h>
 
 /* {{{ Get collation attribute value. */
-PHP_FUNCTION( collator_get_attribute )
+U_CFUNC PHP_FUNCTION( collator_get_attribute )
 {
 	zend_long attribute, value;
 
@@ -40,15 +47,15 @@ PHP_FUNCTION( collator_get_attribute )
 	/* Fetch the object. */
 	COLLATOR_METHOD_FETCH_OBJECT;
 
-	value = ucol_getAttribute( co->ucoll, attribute, COLLATOR_ERROR_CODE_P( co ) );
+	value = ucol_getAttribute( co->ucoll, static_cast<UColAttribute>(attribute), COLLATOR_ERROR_CODE_P( co ) );
 	COLLATOR_CHECK_STATUS( co, "Error getting attribute value" );
 
 	RETURN_LONG( value );
 }
 /* }}} */
 
 /* {{{ Set collation attribute. */
-PHP_FUNCTION( collator_set_attribute )
+U_CFUNC PHP_FUNCTION( collator_set_attribute )
 {
 	zend_long attribute, value;
 	COLLATOR_METHOD_INIT_VARS
@@ -65,15 +72,15 @@ PHP_FUNCTION( collator_set_attribute )
 	COLLATOR_METHOD_FETCH_OBJECT;
 
 	/* Set new value for the given attribute. */
-	ucol_setAttribute( co->ucoll, attribute, value, COLLATOR_ERROR_CODE_P( co ) );
+	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" );
 
 	RETURN_TRUE;
 }
 /* }}} */
 
 /* {{{ Returns the current collation strength. */
-PHP_FUNCTION( collator_get_strength )
+U_CFUNC PHP_FUNCTION( collator_get_strength )
 {
 	COLLATOR_METHOD_INIT_VARS
 
@@ -93,7 +100,7 @@ PHP_FUNCTION( collator_get_strength )
 /* }}} */
 
 /* {{{ Set the collation strength. */
-PHP_FUNCTION( collator_set_strength )
+U_CFUNC PHP_FUNCTION( collator_set_strength )
 {
 	zend_long strength;
 
@@ -110,7 +117,7 @@ PHP_FUNCTION( collator_set_strength )
 	COLLATOR_METHOD_FETCH_OBJECT;
 
 	/* Set given strength. */
-	ucol_setStrength( co->ucoll, strength );
+	ucol_setStrength( co->ucoll, static_cast<UColAttributeValue>(strength) );
 
 	RETURN_TRUE;
 }

ext/intl/collator/collator_class.c ext/intl/collator/collator_class.cppext/intl/collator/collator_class.c renamed to ext/intl/collator/collator_class.cpp

@@ -15,16 +15,18 @@
 
 #include "collator.h"
 #include "collator_class.h"
+extern "C" {
 #include "php_intl.h"
+#include "intl_error.h"
+#include "collator_arginfo.h"
+}
 #include "collator_sort.h"
 #include "collator_convert.h"
-#include "intl_error.h"
 
 #include <unicode/ucol.h>
 
-#include "collator_arginfo.h"
 
-zend_class_entry *Collator_ce_ptr = NULL;
+zend_class_entry *Collator_ce_ptr = nullptr;
 static zend_object_handlers Collator_handlers;
 
 /*
@@ -43,9 +45,9 @@ void Collator_objects_free(zend_object *object )
 /* }}} */
 
 /* {{{ Collator_object_create */
-zend_object *Collator_object_create(zend_class_entry *ce )
+U_CFUNC zend_object *Collator_object_create(zend_class_entry *ce )
 {
-	Collator_object *intern = zend_object_alloc(sizeof(Collator_object), ce);
+	Collator_object *intern = reinterpret_cast<Collator_object *>(zend_object_alloc(sizeof(Collator_object), ce));
 	intl_error_init(COLLATOR_ERROR_P(intern));
 	zend_object_std_init(&intern->zo, ce );
 	object_properties_init(&intern->zo, ce);
@@ -61,7 +63,7 @@ zend_object *Collator_object_create(zend_class_entry *ce )
 /* {{{ collator_register_Collator_symbols
  * Initialize 'Collator' class
  */
-void collator_register_Collator_symbols(int module_number)
+U_CFUNC void collator_register_Collator_symbols(int module_number)
 {
 	register_collator_symbols(module_number);
 
@@ -75,7 +77,7 @@ void collator_register_Collator_symbols(int module_number)
 	/* Collator has no usable clone semantics - ucol_cloneBinary/ucol_openBinary require binary buffer
 	   for which we don't have the place to keep */
 	Collator_handlers.offset = XtOffsetOf(Collator_object, zo);
-	Collator_handlers.clone_obj = NULL;
+	Collator_handlers.clone_obj = nullptr;
 	Collator_handlers.free_obj = Collator_objects_free;
 }
 /* }}} */
@@ -84,7 +86,7 @@ void collator_register_Collator_symbols(int module_number)
  * Initialize internals of Collator_object.
  * Must be called before any other call to 'collator_object_...' functions.
  */
-void collator_object_init( Collator_object* co )
+U_CFUNC void collator_object_init( Collator_object* co )
 {
 	if( !co )
 		return;
@@ -96,15 +98,15 @@ void collator_object_init( Collator_object* co )
 /* {{{ void collator_object_destroy( Collator_object* co )
  * Clean up mem allocted by internals of Collator_object
  */
-void collator_object_destroy( Collator_object* co )
+U_CFUNC void collator_object_destroy( Collator_object* co )
 {
 	if( !co )
 		return;
 
 	if( co->ucoll )
 	{
 		ucol_close( co->ucoll );
-		co->ucoll = NULL;
+		co->ucoll = nullptr;
 	}
 
 	intl_error_reset( COLLATOR_ERROR_P( co ) );