[pull] master from php:master

NEWS

@@ -12,6 +12,10 @@ PHP                                                                        NEWS
   . Fixed stale getElementsByClassName() and other node list caches after
     className/classList writes and attribute removals. (Ilia Alshanetsky)
 
+- Hash:
+  . Fixed hash_file() reporting argument #1 ($algo) instead of argument #2
+    ($filename) when the filename contains null bytes. (lacatoire)
+
 - Intl:
   . Fixed grapheme_strpos() and grapheme_strrpos() with an empty needle
     returning UTF-16 offsets instead of grapheme offsets. (Ilia Alshanetsky)
@@ -26,12 +30,20 @@ PHP                                                                        NEWS
     from compiled rules. (iliaal)
   . Fixed Spoofchecker methods not recording the ICU error code when an ICU
     call fails. (Ilia Alshanetsky)
+  . Fixed idn_to_ascii() and idn_to_utf8() reporting argument #2 ($flags)
+    instead of argument #3 ($variant) for an invalid IDNA variant, and the
+    domain length error message printing a literal "d" instead of the limit.
+    (lacatoire)
 
 - MBString:
   . Fixed mb_ereg_replace() emitting a NUL or out-of-bounds bytes in the
     replacement when a \k<name> backref has no closing delimiter.
     (Ilia Alshanetsky)
 
+- PCNTL:
+  . Fixed the declared signature of pcntl_signal(), whose $restart_syscalls
+    argument accepts null and defaults to it. (lacatoire)
+
 - PDO_PGSQL:
   . Added Pdo\Pgsql::ATTR_CHUNK_SIZE to fetch a result set in chunks of the
     given number of rows. (KentarouTakeda)

ext/intl/formatter/formatter_class.cpp

@@ -71,7 +71,7 @@ U_CFUNC zend_object *NumberFormatter_object_clone(zend_object *object)
 
 	/* clone formatter object. It may fail, the destruction code must handle this case */
 	if (FORMATTER_OBJECT(nfo) != nullptr) {
-		FORMATTER_OBJECT(new_nfo) = FORMATTER_OBJECT(nfo)->clone();
+		FORMATTER_OBJECT(new_nfo) = static_cast<NumberFormat *>(FORMATTER_OBJECT(nfo)->clone());
 		if (FORMATTER_OBJECT(new_nfo) == nullptr) {
 			zend_throw_error(NULL, "Failed to clone NumberFormatter");
 		}

ext/intl/idn/idn.cpp

@@ -122,11 +122,11 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)
 		RETURN_THROWS();
 	}
 	if (UNEXPECTED(ZSTR_LEN(domain) > INT32_MAX - 1)) {
-		zend_argument_value_error(1, "must be less than " PRId32 " bytes", INT32_MAX);
+		zend_argument_value_error(1, "must be less than %" PRId32 " bytes", INT32_MAX);
 		RETURN_THROWS();
 	}
 	if (variant != INTL_IDN_VARIANT_UTS46) {
-		zend_argument_value_error(2, "must be INTL_IDNA_VARIANT_UTS46");
+		zend_argument_value_error(3, "must be INTL_IDNA_VARIANT_UTS46");
 		RETURN_THROWS();
 	}
 	/* don't check options; it wasn't checked before */

ext/intl/rangeformatter/rangeformatter_class.h

@@ -15,9 +15,8 @@
 #ifndef RANGEFORMATTER_CLASS_H
 #define RANGEFORMATTER_CLASS_H
 
-#include <unicode/numberrangeformatter.h>
-
 #ifdef __cplusplus
+#include <unicode/numberrangeformatter.h>
 using icu::number::LocalizedNumberRangeFormatter;
 #else
 typedef void LocalizedNumberRangeFormatter;

ext/intl/tests/idn_uts46_errors.phpt

@@ -18,6 +18,13 @@ try {
     echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
+echo "bad variant, named argument:", "\n";
+try {
+    var_dump(idn_to_utf8("xn--fuball-cta.com", variant: INTL_IDNA_VARIANT_UTS46 + 10));
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
 echo "empty domain:", "\n";
 try {
     var_dump(idn_to_ascii("", 0, INTL_IDNA_VARIANT_UTS46));
@@ -45,7 +52,9 @@ var_dump($foo["errors"]==IDNA_ERROR_CONTEXTJ);
 --EXPECT--
 => PHP level errors
 bad variant:
-ValueError: idn_to_ascii(): Argument #2 ($flags) must be INTL_IDNA_VARIANT_UTS46
+ValueError: idn_to_ascii(): Argument #3 ($variant) must be INTL_IDNA_VARIANT_UTS46
+bad variant, named argument:
+ValueError: idn_to_utf8(): Argument #3 ($variant) must be INTL_IDNA_VARIANT_UTS46
 empty domain:
 ValueError: idn_to_ascii(): Argument #1 ($domain) must not be empty
 with error, but no details arg: