Rename variables

Author: sj-i

Zend/zend_inheritance.c

@@ -1632,7 +1632,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
 
 static zend_always_inline bool check_trait_property_or_constant_value_compatibility(zend_class_entry *ce, zval *op1, zval *op2) /* {{{ */
 {
-	bool compatible;
+	bool is_compatible;
 	zval op1_tmp, op2_tmp;
 
 	/* if any of the values is a constant, we try to resolve it */
@@ -1647,7 +1647,7 @@ static zend_always_inline bool check_trait_property_or_constant_value_compatibil
 		op2 = &op2_tmp;
 	}
 
-	compatible = !fast_is_not_identical_function(op1, op2);
+	is_compatible = !fast_is_not_identical_function(op1, op2);
 
 	if (op1 == &op1_tmp) {
 		zval_ptr_dtor_nogc(&op1_tmp);
@@ -1656,7 +1656,7 @@ static zend_always_inline bool check_trait_property_or_constant_value_compatibil
 		zval_ptr_dtor_nogc(&op2_tmp);
 	}
 
-	return compatible;
+	return is_compatible;
 }
 /* }}} */
 
@@ -2243,7 +2243,7 @@ static zend_class_entry* find_first_constant_definition(zend_class_entry *ce, ze
 static bool do_trait_constant_check(
 	zend_class_entry *ce, zend_class_constant *trait_constant, zend_string *name, zend_class_entry **traits, size_t current_trait
 ) {
-	bool compatible = false;
+	bool is_compatible = false;
 	uint32_t flags_mask = ZEND_ACC_PPP_MASK | ZEND_ACC_FINAL;
 
 	zval *zv = zend_hash_find_known_hash(&ce->constants_table, name);
@@ -2257,17 +2257,17 @@ static bool do_trait_constant_check(
 		return true;
 	}
 	if ((ZEND_CLASS_CONST_FLAGS(trait_constant) & flags_mask) == (ZEND_CLASS_CONST_FLAGS(old_constant) & flags_mask)) {
-		compatible = check_trait_property_or_constant_value_compatibility(ce, &trait_constant->value, &old_constant->value);
+		is_compatible = check_trait_property_or_constant_value_compatibility(ce, &trait_constant->value, &old_constant->value);
 	}
-	if (!compatible) {
+	if (!is_compatible) {
 		zend_error_noreturn(E_COMPILE_ERROR,
 			"%s and %s define the same constant (%s) in the composition of %s. However, the definition differs and is considered incompatible. Class was composed",
 			ZSTR_VAL(find_first_constant_definition(ce, traits, current_trait, name, old_constant->ce)->name),
 			ZSTR_VAL(trait_constant->ce->name),
 			ZSTR_VAL(name),
 			ZSTR_VAL(ce->name));
 	}
-	return compatible;
+	return is_compatible;
 }
 /* }}} */
 
@@ -2336,13 +2336,13 @@ static void zend_do_traits_property_and_constant_binding(zend_class_entry *ce, z
 					zend_hash_del(&ce->properties_info, prop_name);
 					flags |= ZEND_ACC_CHANGED;
 				} else {
-					bool compatible = false;
+					bool is_compatible = false;
 					uint32_t flags_mask = ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC | ZEND_ACC_READONLY;
 
 					if ((colliding_prop->flags & flags_mask) == (flags & flags_mask) &&
 						property_types_compatible(property_info, colliding_prop) == INHERITANCE_SUCCESS
 					) {
-						/* the flags are identical, thus, the properties may be compatible */
+						/* the flags are identical, thus, the properties may be is_compatible */
 						zval *op1, *op2;
 
 						if (flags & ZEND_ACC_STATIC) {
@@ -2354,10 +2354,10 @@ static void zend_do_traits_property_and_constant_binding(zend_class_entry *ce, z
 							op1 = &ce->default_properties_table[OBJ_PROP_TO_NUM(colliding_prop->offset)];
 							op2 = &traits[i]->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)];
 						}
-						compatible = check_trait_property_or_constant_value_compatibility(ce, op1, op2);
+						is_compatible = check_trait_property_or_constant_value_compatibility(ce, op1, op2);
 					}
 
-					if (!compatible) {
+					if (!is_compatible) {
 						zend_error_noreturn(E_COMPILE_ERROR,
 							   "%s and %s define the same property ($%s) in the composition of %s. However, the definition differs and is considered incompatible. Class was composed",
 								ZSTR_VAL(find_first_property_definition(ce, traits, i, prop_name, colliding_prop->ce)->name),