Address review

Author: Girgias

Zend/zend_operators.c

@@ -2532,7 +2532,6 @@ static void ZEND_FASTCALL increment_string(zval *str) /* {{{ */
 		}
 	}
 
-
 	if (!Z_REFCOUNTED_P(str)) {
 		Z_STR_P(str) = zend_string_init(Z_STRVAL_P(str), Z_STRLEN_P(str), 0);
 		Z_TYPE_INFO_P(str) = IS_STRING_EX;
@@ -2666,7 +2665,7 @@ ZEND_API zend_result ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
 			if (Z_OBJ_HT_P(op1)->cast_object(Z_OBJ_P(op1), &tmp, _IS_NUMBER) == SUCCESS) {
 				ZEND_ASSERT(Z_TYPE(tmp) == IS_LONG || Z_TYPE(tmp) == IS_DOUBLE);
 				zval_ptr_dtor(op1);
-				ZVAL_COPY(op1, &tmp);
+				ZVAL_COPY_VALUE(op1, &tmp);
 				goto try_again;
 			}
 			ZEND_FALLTHROUGH;

ext/standard/string.c

@@ -1215,7 +1215,8 @@ PHP_FUNCTION(str_increment)
 
 	do {
 		char c = ZSTR_VAL(incremented)[position];
-		if (EXPECTED( (c >= 'a' && c < 'z') || (c >= 'A' && c < 'Z') || (c >= '0' && c < '9') )) {
+		/* We know c is in ['a', 'z'], ['A', 'Z'], or ['0', '9'] range from zend_string_only_has_ascii_alphanumeric() */
+		if (EXPECTED( c != 'z' && c != 'Z' && c != '9' )) {
 			carry = false;
 			ZSTR_VAL(incremented)[position]++;
 		} else { /* if 'z', 'Z', or '9' */
@@ -1270,7 +1271,8 @@ PHP_FUNCTION(str_decrement)
 
 	do {
 		char c = ZSTR_VAL(decremented)[position];
-		if (EXPECTED( (c > 'a' && c <= 'z') || (c > 'A' && c <= 'Z') || (c > '0' && c <= '9') )) {
+		/* We know c is in ['a', 'z'], ['A', 'Z'], or ['0', '9'] range from zend_string_only_has_ascii_alphanumeric() */
+		if (EXPECTED( c != 'a' && c != 'A' && c != '0' )) {
 			carry = false;
 			ZSTR_VAL(decremented)[position]--;
 		} else { /* if 'a', 'A', or '0' */