Preserve zend_internal_attribute_register as is for internal API BC

Signed-off-by: Bob Weinand <bobwei9@hotmail.com>

Author: bwoebi

UPGRADING.INTERNALS

@@ -39,9 +39,6 @@ PHP 8.2 INTERNALS UPGRADE NOTES
   - zend_object_do_operation_t
 * Added a new zero_position argument to php_stream_fopen_from_fd_rel to reflect
   if this a newly created file so the current file offset needs not to be checked.
-* zend_internal_attribute_register() no longer takes a flags argument nor
-  registers the attribute class directly. Instead specify #[Attribute] with the
-  appropriate target flags in the .stub.php file.
 
 ========================
 2. Build system changes

Zend/zend_attributes.c

@@ -317,7 +317,7 @@ static void free_internal_attribute(zval *v)
 	pefree(Z_PTR_P(v), 1);
 }
 
-ZEND_API zend_internal_attribute *zend_internal_attribute_register(zend_class_entry *ce)
+ZEND_API zend_internal_attribute *zend_mark_internal_attribute(zend_class_entry *ce)
 {
 	zend_internal_attribute *internal_attr;
 	zend_attribute *attr;
@@ -344,6 +344,14 @@ ZEND_API zend_internal_attribute *zend_internal_attribute_register(zend_class_en
 	zend_error_noreturn(E_ERROR, "Classes must be first marked as attribute before being able to be registered as internal attribute class");
 }
 
+ZEND_API zend_internal_attribute *zend_internal_attribute_register(zend_class_entry *ce, uint32_t flags)
+{
+	zend_attribute *attr = zend_add_class_attribute(ce, zend_ce_attribute->name, 1);
+	ZVAL_LONG(&attr->args[0].value, flags);
+
+	return zend_mark_internal_attribute(ce);
+}
+
 ZEND_API zend_internal_attribute *zend_internal_attribute_get(zend_string *lcname)
 {
 	return zend_hash_find_ptr(&internal_attributes, lcname);
@@ -356,23 +364,23 @@ void zend_register_attribute_ce(void)
 	zend_hash_init(&internal_attributes, 8, NULL, free_internal_attribute, 1);
 
 	zend_ce_attribute = register_class_Attribute();
-	attr = zend_internal_attribute_register(zend_ce_attribute);
+	attr = zend_mark_internal_attribute(zend_ce_attribute);
 	attr->validator = validate_attribute;
 
 	zend_ce_return_type_will_change_attribute = register_class_ReturnTypeWillChange();
-	zend_internal_attribute_register(zend_ce_return_type_will_change_attribute);
+	zend_mark_internal_attribute(zend_ce_return_type_will_change_attribute);
 
 	zend_ce_allow_dynamic_properties = register_class_AllowDynamicProperties();
-	attr = zend_internal_attribute_register(zend_ce_allow_dynamic_properties);
+	attr = zend_mark_internal_attribute(zend_ce_allow_dynamic_properties);
 	attr->validator = validate_allow_dynamic_properties;
 
 	zend_ce_sensitive_parameter = register_class_SensitiveParameter();
-	zend_internal_attribute_register(zend_ce_sensitive_parameter);
+	zend_mark_internal_attribute(zend_ce_sensitive_parameter);
 
 	memcpy(&attributes_object_handlers_sensitive_parameter_value, &std_object_handlers, sizeof(zend_object_handlers));
 	attributes_object_handlers_sensitive_parameter_value.get_properties_for = attributes_sensitive_parameter_value_get_properties_for;
 
-	/* This is not an actual attribute, thus the zend_internal_attribute_register() call is missing. */
+	/* This is not an actual attribute, thus the zend_mark_internal_attribute() call is missing. */
 	zend_ce_sensitive_parameter_value = register_class_SensitiveParameterValue();
 	zend_ce_sensitive_parameter_value->create_object = attributes_sensitive_parameter_value_new;
 }

Zend/zend_attributes.h

@@ -77,7 +77,8 @@ ZEND_API zend_result zend_get_attribute_value(zval *ret, zend_attribute *attr, u
 ZEND_API zend_string *zend_get_attribute_target_names(uint32_t targets);
 ZEND_API bool zend_is_attribute_repeated(HashTable *attributes, zend_attribute *attr);
 
-ZEND_API zend_internal_attribute *zend_internal_attribute_register(zend_class_entry *ce);
+ZEND_API zend_internal_attribute *zend_mark_internal_attribute(zend_class_entry *ce);
+ZEND_API zend_internal_attribute *zend_internal_attribute_register(zend_class_entry *ce, uint32_t flags);
 ZEND_API zend_internal_attribute *zend_internal_attribute_get(zend_string *lcname);
 
 ZEND_API zend_attribute *zend_add_attribute(

Zend/zend_builtin_functions.c

@@ -1200,7 +1200,7 @@ ZEND_FUNCTION(set_exception_handler)
 	zend_fcall_info_cache fcc;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_FUNC_OR_NULL(fci, fcc)
+		Z_PARAM_FUNC_OR_NULL(fci, fcc)`
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {

build/gen_stub.php

@@ -73,7 +73,7 @@ function processStubFile(string $stubFile, Context $context, bool $includeOnly =
 
             foreach ($fileInfo->dependencies as $dependency) {
                 // TODO add header search path for extensions?
-                $prefixes = [dirname($stubFile) . "/", ""];
+                $prefixes = [dirname($stubFile) . "/", dirname(__DIR__) . "/"];
                 foreach ($prefixes as $prefix) {
                     $depFile = $prefix . $dependency;
                     if (file_exists($depFile)) {

ext/zend_test/test.c

@@ -634,12 +634,12 @@ PHP_MINIT_FUNCTION(zend_test)
 
 	zend_test_attribute = register_class_ZendTestAttribute();
 	{
-		zend_internal_attribute *attr = zend_internal_attribute_register(zend_test_attribute);
+		zend_internal_attribute *attr = zend_mark_internal_attribute(zend_test_attribute);
 		attr->validator = zend_attribute_validate_zendtestattribute;
 	}
 
 	zend_test_parameter_attribute = register_class_ZendTestParameterAttribute();
-	zend_internal_attribute_register(zend_test_parameter_attribute);
+	zend_mark_internal_attribute(zend_test_parameter_attribute);
 
 	{
 		zend_attribute *attr;