Fix double deprecation notice in debug builds

Also fix memory exhaustion test text to be valid on prod builds

Author: Girgias

Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_write_variation1.phpt

@@ -25,4 +25,4 @@ Stack trace:
 #0 {main}
   thrown in %s on line %d
 
-Fatal error: Allowed memory size of %d bytes exhausted at %s:141 (tried to allocate %d bytes) in %s on line %d
+Fatal error: Allowed memory size of %d bytes exhausted %S(tried to allocate %d bytes) in %s on line %d

Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_write_variation2.phpt

@@ -25,4 +25,4 @@ Stack trace:
 #0 {main}
   thrown in %s on line %d
 
-Fatal error: Allowed memory size of %d bytes exhausted at %s:141 (tried to allocate %d bytes) in %s on line %d
+Fatal error: Allowed memory size of %d bytes exhausted %S(tried to allocate %d bytes) in %s on line %d

Zend/tests/float_to_int/warnings_float_literals.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Implicit float to int conversions should warn for literals
---XFAIL--
-Double warning for internal calls
 --FILE--
 <?php
 
@@ -52,7 +50,6 @@ function foo(int $a) {
 }
 var_dump(foo(1.5));
 
-// TODO: Why are two warnings generated here?
 var_dump(chr(60.5));
 
 echo 'Function returns:' . \PHP_EOL;
@@ -130,8 +127,6 @@ Function calls:
 Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
 int(1)
 
-Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
-
 Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
 string(1) "<"
 Function returns:

Zend/tests/float_to_int/warnings_float_vars.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Implicit float to int conversions should warn for variables
---XFAIL--
-Double warning for internal calls
 --FILE--
 <?php
 
@@ -72,7 +70,6 @@ function foo(int $a) {
 }
 var_dump(foo($float));
 
-// TODO: Why are two warnings generated here?
 $cp = 60.5;
 var_dump(chr($cp));
 
@@ -159,8 +156,6 @@ Function calls:
 Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
 int(1)
 
-Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
-
 Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
 string(1) "<"
 Function returns:

Zend/tests/float_to_int/warnings_string_float_literals.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Implicit string float to int conversions should warn for literals
---XFAIL--
-Double warning for internal calls
 --FILE--
 <?php
 
@@ -35,7 +33,6 @@ function foo(int $a) {
 }
 var_dump(foo('1.5'));
 
-// TODO: Why are two warnings generated here?
 var_dump(chr('60.5'));
 
 echo 'Function returns:' . \PHP_EOL;
@@ -88,8 +85,6 @@ Function calls:
 Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
 int(1)
 
-Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
-
 Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
 string(1) "<"
 Function returns:

Zend/tests/float_to_int/warnings_string_float_vars.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Implicit float string to int conversions should warn for variables
---XFAIL--
-Double warning for internal calls
 --FILE--
 <?php
 
@@ -53,7 +51,6 @@ function foo(int $a) {
 }
 var_dump(foo($float));
 
-// TODO: Why are two warnings generated here?
 $cp = '60.5';
 var_dump(chr($cp));
 
@@ -115,8 +112,6 @@ Function calls:
 Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
 int(1)
 
-Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
-
 Deprecated: Implicit conversion to int from non-compatible float-string in %s on line %d
 string(1) "<"
 Function returns:

Zend/zend_API.c

@@ -487,7 +487,15 @@ ZEND_API bool ZEND_FASTCALL zend_parse_arg_long_weak(zval *arg, zend_long *dest,
 		if (UNEXPECTED(!ZEND_DOUBLE_FITS_LONG(Z_DVAL_P(arg)))) {
 			return 0;
 		} else {
-			*dest = zend_dval_to_lval_safe(Z_DVAL_P(arg));
+			/* Manually check arg_num is not (uint32_t)-1, as otherwise its called by
+			 * zend_verify_weak_scalar_type_hint_no_sideeffect() */
+			if (UNEXPECTED(!is_long_compatible(Z_DVAL_P(arg)) && arg_num != (uint32_t)-1)) {
+				zend_error(E_DEPRECATED, "Implicit conversion to int from non-compatible float");
+				if (UNEXPECTED(EG(exception))) {
+					return 0;
+				}
+			}
+			*dest = zend_dval_to_lval(Z_DVAL_P(arg));
 		}
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
 		double d;
@@ -503,9 +511,14 @@ ZEND_API bool ZEND_FASTCALL zend_parse_arg_long_weak(zval *arg, zend_long *dest,
 				}
 
 				/* This only checks for a fractional part as if doesn't fit it already throws a TypeError
-				 * Manually check to get correct warning text mentioning string origin */
-				if (!is_long_compatible(d)) {
+				 * Manually check to get correct warning text mentioning string origin
+				 * Check arg_num is not (uint32_t)-1, as otherwise its called by
+				 * zend_verify_weak_scalar_type_hint_no_sideeffect() */
+				if (UNEXPECTED(!is_long_compatible(d) && arg_num != (uint32_t)-1)) {
 					zend_error(E_DEPRECATED, "Implicit conversion to int from non-compatible float-string");
+					if (UNEXPECTED(EG(exception))) {
+						return 0;
+					}
 				}
 				*dest = zend_dval_to_lval(d);
 			} else {

Zend/zend_execute.c

@@ -781,16 +781,17 @@ static bool zend_verify_weak_scalar_type_hint_no_sideeffect(uint32_t type_mask,
 	double dval;
 	bool bval;
 
-	if ((type_mask & MAY_BE_LONG) && zend_parse_arg_long_weak(arg, &lval, 0)) {
+	/* Pass (uint32_t)-1 as arg_num to indicate to ZPP not to emit any deprecation notice */
+	if ((type_mask & MAY_BE_LONG) && zend_parse_arg_long_weak(arg, &lval, (uint32_t)-1)) {
 		return 1;
 	}
-	if ((type_mask & MAY_BE_DOUBLE) && zend_parse_arg_double_weak(arg, &dval, 0)) {
+	if ((type_mask & MAY_BE_DOUBLE) && zend_parse_arg_double_weak(arg, &dval, (uint32_t)-1)) {
 		return 1;
 	}
 	if ((type_mask & MAY_BE_STRING) && can_convert_to_string(arg)) {
 		return 1;
 	}
-	if ((type_mask & MAY_BE_BOOL) == MAY_BE_BOOL && zend_parse_arg_bool_weak(arg, &bval, 0)) {
+	if ((type_mask & MAY_BE_BOOL) == MAY_BE_BOOL && zend_parse_arg_bool_weak(arg, &bval, (uint32_t)-1)) {
 		return 1;
 	}
 	return 0;