Cleanup and tweaks

Author: DanielEScherzer

UPGRADING

@@ -653,9 +653,7 @@ PHP 8.5 UPGRADE NOTES
 - Core:
   . NoDiscard attribute was added.
     RFC: https://wiki.php.net/rfc/marking_return_value_as_important
-  . DelayedTargetValidation is an attribute that, when added, delays any errors
-    from *other* internal attributes about being applied to invalid targets from
-    compile-time to runtime.
+  . DelayedTargetValidation attribute was added.
     RFC: https://wiki.php.net/rfc/delayedtargetvalidation_attribute
 
 - Curl:

Zend/zend_attributes.c

@@ -217,9 +217,9 @@ static zend_string *validate_nodiscard(
 	zend_attribute *attr, uint32_t target, zend_class_entry *scope)
 {
 	ZEND_ASSERT(CG(in_compilation));
-	zend_op_array *op_array = CG(active_op_array);
 	const zend_string *prop_info_name = CG(context).active_property_info_name;
 	if (prop_info_name == NULL) {
+		zend_op_array *op_array = CG(active_op_array);
 		op_array->fn_flags |= ZEND_ACC_NODISCARD;
 		return NULL;
 	}
@@ -524,12 +524,7 @@ ZEND_API zend_internal_attribute *zend_mark_internal_attribute(zend_class_entry
 		if (zend_string_equals(attr->name, zend_ce_attribute->name)) {
 			internal_attr = pemalloc(sizeof(zend_internal_attribute), 1);
 			internal_attr->ce = ce;
-			if (attr->argc == 0) {
-				// Apply default of Attribute::TARGET_ALL
-				internal_attr->flags = ZEND_ATTRIBUTE_TARGET_ALL;
-			} else {
-				internal_attr->flags = Z_LVAL(attr->args[0].value);
-			}
+			internal_attr->flags = Z_LVAL(attr->args[0].value);
 			internal_attr->validator = NULL;
 
 			zend_string *lcname = zend_string_tolower_ex(ce->name, 1);

Zend/zend_attributes.stub.php

@@ -101,5 +101,5 @@ public function __construct(?string $message = null) {}
 /**
  * @strict-properties
  */
-#[Attribute]
+#[Attribute(Attribute::TARGET_ALL)]
 final class DelayedTargetValidation {}

Zend/zend_attributes_arginfo.h

@@ -8539,8 +8539,9 @@ static zend_op_array *zend_compile_func_decl_ex(
 	if (op_array->fn_flags & ZEND_ACC_NODISCARD) {
 		/* ZEND_ACC_NODISCARD gets added by the attribute validator, but only
 		 * if the method is not a hook; if it is a hook, then the validator
-		 * should have either thrown an error or done nothing due to delayed
-		 * target validation. */
+		 * will have returned an error message, even if the error message was
+		 * delayed with #[\DelayedTargetValidation] that ZEND_ACC_NODISCARD
+		 * flag should not have been added. */
 		ZEND_ASSERT(!is_hook);
 
 		if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {

Zend/zend_compile.c

@@ -7331,8 +7331,10 @@ ZEND_METHOD(ReflectionAttribute, newInstance)
 	 * - the attribute is an internal attribute, and it had the target and
 	 *   and repetition validated already
 	 * - the attribute is an internal attribute and repetition was validated
-	 *   already, but the target was not validated due to the presence of
-	 *   #[DelayedTargetValidation]
+	 *   already, the internal validator might have been run if the target was
+	 *   correct, but any error would have been stored in
+	 *   `zend_attribute.validation_error` instead of being thrown due to the
+	 *   presence of #[DelayedTargetValidation]
 	 * - the attribute is a user attribute, and neither target nor repetition
 	 *   have been validated.
 	 */
@@ -7358,7 +7360,7 @@ ZEND_METHOD(ReflectionAttribute, newInstance)
 		RETURN_THROWS();
 	}
 
-	/* Run the delayed validator function for internal attributes */
+	/* Report the delayed validator error for internal attributes */
 	if (delayed_target_validation && ce->type == ZEND_INTERNAL_CLASS) {
 		zend_string *error = attr->data->validation_error;
 		if (error != NULL) {