zend_apply_internal_attribute_validation()

Author: DanielEScherzer

Zend/zend_attributes.c

@@ -122,36 +122,41 @@ void compile_alias_attributes(
 	}
 
 	if (*attributes != NULL) {
-		/* Validate attributes in a secondary loop (needed to detect repeated attributes). */
-		ZEND_HASH_PACKED_FOREACH_PTR(*attributes, attr) {
-			if (attr->offset != 0 || NULL == (config = zend_internal_attribute_get(attr->lcname))) {
-				continue;
-			}
+		zend_apply_internal_attribute_validation(*attributes, 0, ZEND_ATTRIBUTE_TARGET_CLASS_ALIAS);
+	}
+}
+/* }}} */
 
-			uint32_t target = ZEND_ATTRIBUTE_TARGET_CLASS_ALIAS;
+ZEND_API void zend_apply_internal_attribute_validation(HashTable *attributes, uint32_t offset, uint32_t target) {
+	zend_attribute *attr;
+	zend_internal_attribute *config;
 
-			if (!(target & (config->flags & ZEND_ATTRIBUTE_TARGET_ALL))) {
-				zend_string *location = zend_get_attribute_target_names(target);
-				zend_string *allowed = zend_get_attribute_target_names(config->flags);
+	/* Validate attributes in a secondary loop (needed to detect repeated attributes). */
+	ZEND_HASH_PACKED_FOREACH_PTR(attributes, attr) {
+		if (attr->offset != offset || NULL == (config = zend_internal_attribute_get(attr->lcname))) {
+			continue;
+		}
 
-				zend_error_noreturn(E_ERROR, "Attribute \"%s\" cannot target %s (allowed targets: %s)",
-					ZSTR_VAL(attr->name), ZSTR_VAL(location), ZSTR_VAL(allowed)
-				);
-			}
+		if (!(target & (config->flags & ZEND_ATTRIBUTE_TARGET_ALL))) {
+			zend_string *location = zend_get_attribute_target_names(target);
+			zend_string *allowed = zend_get_attribute_target_names(config->flags);
 
-			if (!(config->flags & ZEND_ATTRIBUTE_IS_REPEATABLE)) {
-				if (zend_is_attribute_repeated(*attributes, attr)) {
-					zend_error_noreturn(E_ERROR, "Attribute \"%s\" must not be repeated", ZSTR_VAL(attr->name));
-				}
-			}
+			zend_error_noreturn(E_ERROR, "Attribute \"%s\" cannot target %s (allowed targets: %s)",
+				ZSTR_VAL(attr->name), ZSTR_VAL(location), ZSTR_VAL(allowed)
+			);
+		}
 
-			if (config->validator != NULL) {
-				config->validator(attr, target, CG(active_class_entry));
+		if (!(config->flags & ZEND_ATTRIBUTE_IS_REPEATABLE)) {
+			if (zend_is_attribute_repeated(attributes, attr)) {
+				zend_error_noreturn(E_ERROR, "Attribute \"%s\" must not be repeated", ZSTR_VAL(attr->name));
 			}
-		} ZEND_HASH_FOREACH_END();
-	}
+		}
+
+		if (config->validator != NULL) {
+			config->validator(attr, target, CG(active_class_entry));
+		}
+	} ZEND_HASH_FOREACH_END();
 }
-/* }}} */
 
 uint32_t zend_attribute_attribute_get_flags(zend_attribute *attr, zend_class_entry *scope)
 {

Zend/zend_attributes.h

@@ -96,6 +96,8 @@ ZEND_API zend_attribute *zend_add_attribute(
 
 uint32_t zend_attribute_attribute_get_flags(zend_attribute *attr, zend_class_entry *scope);
 
+ZEND_API void zend_apply_internal_attribute_validation(HashTable *attributes, uint32_t offset, uint32_t target);
+
 END_EXTERN_C()
 
 static zend_always_inline zend_attribute *zend_add_class_attribute(zend_class_entry *ce, zend_string *name, uint32_t argc)

Zend/zend_compile.c

@@ -7468,31 +7468,7 @@ static void zend_compile_attributes(
 	}
 
 	if (*attributes != NULL) {
-		/* Validate attributes in a secondary loop (needed to detect repeated attributes). */
-		ZEND_HASH_PACKED_FOREACH_PTR(*attributes, attr) {
-			if (attr->offset != offset || NULL == (config = zend_internal_attribute_get(attr->lcname))) {
-				continue;
-			}
-
-			if (!(target & (config->flags & ZEND_ATTRIBUTE_TARGET_ALL))) {
-				zend_string *location = zend_get_attribute_target_names(target);
-				zend_string *allowed = zend_get_attribute_target_names(config->flags);
-
-				zend_error_noreturn(E_ERROR, "Attribute \"%s\" cannot target %s (allowed targets: %s)",
-					ZSTR_VAL(attr->name), ZSTR_VAL(location), ZSTR_VAL(allowed)
-				);
-			}
-
-			if (!(config->flags & ZEND_ATTRIBUTE_IS_REPEATABLE)) {
-				if (zend_is_attribute_repeated(*attributes, attr)) {
-					zend_error_noreturn(E_ERROR, "Attribute \"%s\" must not be repeated", ZSTR_VAL(attr->name));
-				}
-			}
-
-			if (config->validator != NULL) {
-				config->validator(attr, target, CG(active_class_entry));
-			}
-		} ZEND_HASH_FOREACH_END();
+		zend_apply_internal_attribute_validation(*attributes, offset, target);
 	}
 }
 /* }}} */