php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Pass flags to #[Attribute] on internal attributes
This commit is contained in:
Nikita Popov
2021-05-21 11:42:11 +02:00
parent b97a080034 db6e60e744
commit b849aa6494
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/tests/attributes/007_self_reflect_attribute.phpt
View File

@@ -12,12 +12,14 @@ foreach ($attributes as $attribute) {
$a = $attribute->newInstance();
var_dump(get_class($a));
var_dump($a->flags == Attribute::TARGET_ALL);
var_dump($a->flags == Attribute::TARGET_CLASS);
}
?>
--EXPECT--
string(9) "Attribute"
array(0) {
array(1) {
[0]=>
int(1)
}
string(9) "Attribute"
bool(true)

17
Zend/zend_attributes.c
View File

@@ -241,24 +241,25 @@ static void free_internal_attribute(zval *v)
ZEND_API zend_internal_attribute *zend_internal_attribute_register(zend_class_entry *ce, uint32_t flags)
{
zend_internal_attribute *attr;
zend_internal_attribute *internal_attr;
if (ce->type != ZEND_INTERNAL_CLASS) {
zend_error_noreturn(E_ERROR, "Only internal classes can be registered as compiler attribute");
}
attr = pemalloc(sizeof(zend_internal_attribute), 1);
attr->ce = ce;
attr->flags = flags;
attr->validator = NULL;
internal_attr = pemalloc(sizeof(zend_internal_attribute), 1);
internal_attr->ce = ce;
internal_attr->flags = flags;
internal_attr->validator = NULL;
zend_string *lcname = zend_string_tolower_ex(ce->name, 1);
zend_hash_update_ptr(&internal_attributes, lcname, attr);
zend_add_class_attribute(ce, zend_ce_attribute->name, 0);
zend_hash_update_ptr(&internal_attributes, lcname, internal_attr);
zend_attribute *attr = zend_add_class_attribute(ce, zend_ce_attribute->name, 1);
ZVAL_LONG(&attr->args[0].value, flags);
zend_string_release(lcname);
return attr;
return internal_attr;
}
ZEND_API zend_internal_attribute *zend_internal_attribute_get(zend_string *lcname)