Use is_numeric_str_function() more often

Author: Girgias

Zend/zend_execute.c

@@ -728,7 +728,7 @@ static zend_bool zend_verify_weak_scalar_type_hint(uint32_t type_mask, zval *arg
 		/* For an int|float union type and string value,
 		 * determine chosen type by is_numeric_string() semantics. */
 		if ((type_mask & MAY_BE_DOUBLE) && Z_TYPE_P(arg) == IS_STRING) {
-			zend_uchar type = is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), &lval, &dval, false);
+			zend_uchar type = is_numeric_str_function(Z_STR_P(arg), &lval, &dval);
 			if (type == IS_LONG) {
 				zend_string_release(Z_STR_P(arg));
 				ZVAL_LONG(arg, lval);

Zend/zend_operators.c

@@ -2417,7 +2417,7 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
 				zend_long lval;
 				double dval;
 
-				switch (is_numeric_string(Z_STRVAL_P(op1), Z_STRLEN_P(op1), &lval, &dval, false)) {
+				switch (is_numeric_str_function(Z_STR_P(op1), &lval, &dval)) {
 					case IS_LONG:
 						zval_ptr_dtor_str(op1);
 						if (lval == ZEND_LONG_MAX) {
@@ -2484,7 +2484,7 @@ ZEND_API int ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
 				ZVAL_LONG(op1, -1);
 				break;
 			}
-			switch (is_numeric_string(Z_STRVAL_P(op1), Z_STRLEN_P(op1), &lval, &dval, false)) {
+			switch (is_numeric_str_function(Z_STR_P(op1), &lval, &dval)) {
 				case IS_LONG:
 					zval_ptr_dtor_str(op1);
 					if (lval == ZEND_LONG_MIN) {