Merge branch 'php:master' into master

Author: marcosmarcolin

LICENSE

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2022 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2023 The PHP Group. All rights reserved.
 --------------------------------------------------------------------
 
 Redistribution and use in source and binary forms, with or without

NEWS

@@ -51,6 +51,8 @@ PHP                                                                        NEWS
     casing rules for the Greek letter sigma. For mb_convert_case, conditional
     casing only applies to MB_CASE_LOWER and MB_CASE_TITLE modes, not to
     MB_CASE_LOWER_SIMPLE and MB_CASE_TITLE_SIMPLE. (Alex Dowad)
+  . mb_detect_encoding is better able to identify UTF-8 and UTF-16 strings
+    with a byte-order mark. (Alex Dowad)
 
 - Opcache:
   . Added start, restart and force restart time to opcache's
@@ -96,4 +98,7 @@ PHP                                                                        NEWS
   . Fixed bug #51056: blocking fread() will block even if data is available.
     (Jakub Zelenka)
 
+- XSLTProcessor:
+  . Fixed bug #69168 (DomNode::getNodePath() returns invalid path). (nielsdos)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -65,6 +65,9 @@ PHP 8.3 UPGRADE NOTES
 - Standard:
   . E_NOTICEs emitted by unserialized() have been promoted to E_WARNING.
     RFC: https://wiki.php.net/rfc/improve_unserialize_error_handling
+  . array_pad() is now only limited by the maximum number of elements an array
+    can have. Before, it was only possible to add at most 1048576 elements at a
+    time.
 
 ========================================
 6. New Functions

Zend/zend_operators.c

@@ -60,8 +60,8 @@ static _locale_t current_locale = NULL;
 /* Common code for SSE2 accelerated character case conversion */
 
 #define BLOCKCONV_INIT_RANGE(start, end) \
-	const __m128i blconv_start_minus_1 = _mm_set1_epi8((start) - 1); \
-	const __m128i blconv_end_plus_1 = _mm_set1_epi8((end) + 1);
+	const __m128i blconv_offset = _mm_set1_epi8((signed char)(SCHAR_MIN - start)); \
+	const __m128i blconv_threshold = _mm_set1_epi8(SCHAR_MIN + (end - start) + 1);
 
 #define BLOCKCONV_STRIDE sizeof(__m128i)
 
@@ -70,14 +70,12 @@ static _locale_t current_locale = NULL;
 
 #define BLOCKCONV_LOAD(input) \
 	__m128i blconv_operand = _mm_loadu_si128((__m128i*)(input)); \
-	__m128i blconv_gt = _mm_cmpgt_epi8(blconv_operand, blconv_start_minus_1); \
-	__m128i blconv_lt = _mm_cmplt_epi8(blconv_operand, blconv_end_plus_1); \
-	__m128i blconv_mingle = _mm_and_si128(blconv_gt, blconv_lt);
+	__m128i blconv_mask = _mm_cmplt_epi8(_mm_add_epi8(blconv_operand, blconv_offset), blconv_threshold);
 
-#define BLOCKCONV_FOUND() _mm_movemask_epi8(blconv_mingle)
+#define BLOCKCONV_FOUND() _mm_movemask_epi8(blconv_mask)
 
 #define BLOCKCONV_STORE(dest) \
-	__m128i blconv_add = _mm_and_si128(blconv_mingle, blconv_delta); \
+	__m128i blconv_add = _mm_and_si128(blconv_mask, blconv_delta); \
 	__m128i blconv_result = _mm_add_epi8(blconv_operand, blconv_add); \
 	_mm_storeu_si128((__m128i *)(dest), blconv_result);
 

Zend/zend_vm_def.h

@@ -2130,6 +2130,7 @@ ZEND_VM_C_LABEL(fetch_obj_r_fast_copy):
 #if ZEND_DEBUG
 		if (!EG(exception) && prop_info && prop_info != ZEND_WRONG_PROPERTY_INFO
 				&& ZEND_TYPE_IS_SET(prop_info->type)) {
+			ZVAL_OPT_DEREF(retval);
 			zend_verify_property_type(prop_info, retval, /* strict */ true);
 		}
 #endif

Zend/zend_vm_execute.h

@@ -30,15 +30,31 @@
 # include "timelib_config.h"
 #endif
 
-#define TIMELIB_VERSION 202203
-#define TIMELIB_EXTENDED_VERSION 20220301
-#define TIMELIB_ASCII_VERSION "2022.03"
+#define TIMELIB_VERSION 202204
+#define TIMELIB_EXTENDED_VERSION 20220401
+#define TIMELIB_ASCII_VERSION "2022.04"
 
 #include <stdlib.h>
 #include <stdbool.h>
 #include <limits.h>
 #include <inttypes.h>
 
+# ifndef HAVE_INT32_T
+#  if SIZEOF_INT == 4
+typedef int int32_t;
+#  elif SIZEOF_LONG == 4
+typedef long int int32_t;
+#  endif
+# endif
+
+# ifndef HAVE_UINT32_T
+#  if SIZEOF_INT == 4
+typedef unsigned int uint32_t;
+#  elif SIZEOF_LONG == 4
+typedef unsigned long int uint32_t;
+#  endif
+# endif
+
 #ifdef _WIN32
 # if _MSC_VER >= 1600
 # include <stdint.h>

ext/date/lib/timelib.h

@@ -10,6 +10,7 @@ final class FFI
         /**
          * @var int
          * @cvalue __BIGGEST_ALIGNMENT__
+         * @link ffi-ffi.constants.biggest-alignment
          */
         public const __BIGGEST_ALIGNMENT__ = UNKNOWN;
 

ext/ffi/ffi.stub.php

@@ -862,6 +862,26 @@ static inline void _gmp_unary_opl(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_opl_t
 }
 /* }}} */
 
+static bool gmp_verify_base(zend_long base, uint32_t arg_num)
+{
+	if (base && (base < 2 || base > GMP_MAX_BASE)) {
+		zend_argument_value_error(arg_num, "must be between 2 and %d", GMP_MAX_BASE);
+		return false;
+	}
+
+	return true;
+}
+
+static zend_result gmp_initialize_number(mpz_ptr gmp_number, const zend_string *arg_str, zend_long arg_l, zend_long base)
+{
+	if (arg_str) {
+		return convert_zstr_to_gmp(gmp_number, arg_str, base, 1);
+	}
+
+	mpz_set_si(gmp_number, arg_l);
+	return SUCCESS;
+}
+
 /* {{{ Initializes GMP number */
 ZEND_FUNCTION(gmp_init)
 {
@@ -876,18 +896,14 @@ ZEND_FUNCTION(gmp_init)
 		Z_PARAM_LONG(base)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (base && (base < 2 || base > GMP_MAX_BASE)) {
-		zend_argument_value_error(2, "must be between 2 and %d", GMP_MAX_BASE);
+	if (!gmp_verify_base(base, 2)) {
 		RETURN_THROWS();
 	}
 
 	INIT_GMP_RETVAL(gmp_number);
-	if (arg_str) {
-		if (convert_zstr_to_gmp(gmp_number, arg_str, base, 1) == FAILURE) {
-			RETURN_THROWS();
-		}
-	} else {
-		mpz_set_si(gmp_number, arg_l);
+
+	if (gmp_initialize_number(gmp_number, arg_str, arg_l, base) == FAILURE) {
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -2021,6 +2037,30 @@ ZEND_FUNCTION(gmp_scan1)
 }
 /* }}} */
 
+ZEND_METHOD(GMP, __construct)
+{
+	zend_string *arg_str = NULL;
+	zend_long arg_l = 0;
+	zend_long base = 0;
+
+	ZEND_PARSE_PARAMETERS_START(0, 2)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_STR_OR_LONG(arg_str, arg_l)
+		Z_PARAM_LONG(base)
+	ZEND_PARSE_PARAMETERS_END();
+
+	if (!gmp_verify_base(base, 2)) {
+		RETURN_THROWS();
+	}
+
+	return_value = ZEND_THIS;
+	mpz_ptr gmp_number = GET_GMP_FROM_ZVAL(ZEND_THIS);
+
+	if (gmp_initialize_number(gmp_number, arg_str, arg_l, base) == FAILURE) {
+		RETURN_THROWS();
+	}
+}
+
 ZEND_METHOD(GMP, __serialize)
 {
 	ZEND_PARSE_PARAMETERS_NONE();

ext/ffi/ffi_arginfo.h

@@ -59,6 +59,8 @@
 
 class GMP
 {
+    public function __construct(int|string $num = 0, int $base = 0) {}
+
     public function __serialize(): array {}
 
     public function __unserialize(array $data): void {}

ext/gmp/gmp.c

@@ -0,0 +1,51 @@
+--TEST--
+Constructor for GMP
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+var_dump(new GMP);
+var_dump(new GMP(0));
+var_dump(new GMP(123));
+var_dump(new GMP("0xAA"));
+var_dump(new GMP("12", 4));
+try {
+    var_dump(new GMP("12", 999));
+} catch (ValueError $e) {
+    echo $e->getMessage() . "\n";
+}
+try {
+    var_dump(new GMP("", 10));
+} catch (ValueError $e) {
+    echo $e->getMessage() . "\n";
+}
+try {
+    var_dump(new GMP("hello"));
+} catch (ValueError $e) {
+    echo $e->getMessage() . "\n";
+}
+?>
+--EXPECT--
+object(GMP)#1 (1) {
+  ["num"]=>
+  string(1) "0"
+}
+object(GMP)#1 (1) {
+  ["num"]=>
+  string(1) "0"
+}
+object(GMP)#1 (1) {
+  ["num"]=>
+  string(3) "123"
+}
+object(GMP)#1 (1) {
+  ["num"]=>
+  string(3) "170"
+}
+object(GMP)#1 (1) {
+  ["num"]=>
+  string(1) "6"
+}
+GMP::__construct(): Argument #2 ($base) must be between 2 and 62
+GMP::__construct(): Argument #1 ($num) is not an integer string
+GMP::__construct(): Argument #1 ($num) is not an integer string