Hardening, cleanup, more tests

Author: DanielEScherzer

Zend/tests/attributes/034_target_values.phpt

@@ -0,0 +1,39 @@
+--TEST--
+Attribute flags are all different, TARGET_ALL includes all targets
+--FILE--
+<?php
+
+function showFlag( string $name, int $value ) {
+    $all = Attribute::TARGET_ALL;
+    $and = $all & $value;
+    echo "Attribute::$name = $value ($all & $value === $and)\n";
+}
+
+showFlag( "TARGET_CLASS", Attribute::TARGET_CLASS );
+showFlag( "TARGET_FUNCTION", Attribute::TARGET_FUNCTION );
+showFlag( "TARGET_METHOD", Attribute::TARGET_METHOD );
+showFlag( "TARGET_PROPERTY", Attribute::TARGET_PROPERTY );
+showFlag( "TARGET_CLASS_CONSTANT", Attribute::TARGET_CLASS_CONSTANT );
+showFlag( "TARGET_PARAMETER", Attribute::TARGET_PARAMETER );
+showFlag( "TARGET_CONSTANT", Attribute::TARGET_CONSTANT );
+showFlag( "IS_REPEATABLE", Attribute::IS_REPEATABLE );
+
+$all = Attribute::TARGET_CLASS | Attribute::TARGET_FUNCTION
+    | Attribute::TARGET_METHOD | Attribute::TARGET_PROPERTY
+    | Attribute::TARGET_CLASS_CONSTANT | Attribute::TARGET_PARAMETER
+    | Attribute::TARGET_CONSTANT;
+var_dump( $all, Attribute::TARGET_ALL, $all === Attribute::TARGET_ALL );
+
+?>
+--EXPECT--
+Attribute::TARGET_CLASS = 1 (127 & 1 === 1)
+Attribute::TARGET_FUNCTION = 2 (127 & 2 === 2)
+Attribute::TARGET_METHOD = 4 (127 & 4 === 4)
+Attribute::TARGET_PROPERTY = 8 (127 & 8 === 8)
+Attribute::TARGET_CLASS_CONSTANT = 16 (127 & 16 === 16)
+Attribute::TARGET_PARAMETER = 32 (127 & 32 === 32)
+Attribute::TARGET_CONSTANT = 64 (127 & 64 === 64)
+Attribute::IS_REPEATABLE = 128 (127 & 128 === 0)
+int(127)
+int(127)
+bool(true)

Zend/tests/attributes/constants/allow_named_parameters.phpt

@@ -15,7 +15,7 @@ var_dump( $attribs[0]->getArguments() );
 --EXPECTF--
 array(1) {
   [0]=>
-  object(ReflectionAttribute)#2 (1) {
+  object(ReflectionAttribute)#%d (1) {
     ["name"]=>
     string(11) "MyAttribute"
   }

Zend/tests/attributes/constants/constant_listed_as_target-userland.phpt

@@ -18,7 +18,7 @@ $attribs[0]->newInstance();
 --EXPECTF--
 array(1) {
   [0]=>
-  object(ReflectionAttribute)#2 (1) {
+  object(ReflectionAttribute)#%d (1) {
     ["name"]=>
     string(19) "MyConstantAttribute"
   }

Zend/tests/attributes/constants/constant_redefined_change.phpt

@@ -1,5 +1,5 @@
 --TEST--
-If a constant is redefined, attributes remain unchanged (attributes change)
+If a constant is redefined, attributes remain unchanged (different attributes)
 --FILE--
 <?php
 

Zend/tests/attributes/constants/target_all_targets_const-default.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Attributes with TARGET_ALL (from the default) can target constants
+--FILE--
+<?php
+
+#[Attribute]
+class MyAttribute {}
+
+#[MyAttribute]
+const EXAMPLE = 'Foo';
+
+$ref = new ReflectionConstant('EXAMPLE');
+$attribs = $ref->getAttributes();
+var_dump( $attribs );
+$attribs[0]->newInstance();
+
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  object(ReflectionAttribute)#%d (1) {
+    ["name"]=>
+    string(11) "MyAttribute"
+  }
+}

Zend/tests/attributes/constants/target_all_targets_const-explicit.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Attributes with TARGET_ALL (from an explicit parameter) can target constants
+--FILE--
+<?php
+
+#[Attribute(Attribute::TARGET_ALL)]
+class MyAttribute {}
+
+#[MyAttribute]
+const EXAMPLE = 'Foo';
+
+$ref = new ReflectionConstant('EXAMPLE');
+$attribs = $ref->getAttributes();
+var_dump( $attribs );
+$attribs[0]->newInstance();
+
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  object(ReflectionAttribute)#%d (1) {
+    ["name"]=>
+    string(11) "MyAttribute"
+  }
+}

Zend/zend_attributes.c

@@ -255,18 +255,14 @@ ZEND_API zend_result zend_get_attribute_value(zval *ret, zend_attribute *attr, u
 		return SUCCESS;
 	}
 	zend_ast *arg_ast = Z_ASTVAL_P(ret);
-	zend_result result;
 	if (arg_ast->kind == ZEND_AST_NAMED_ARG) {
 		attr->args[i].name = zend_string_copy(zend_ast_get_str(arg_ast->child[0]));
 		zend_ast *value = arg_ast->child[1];
 		zend_ast_ref *ast_ref = zend_ast_copy(value);
 		zval_ptr_dtor(ret);
 		ZVAL_AST(ret, ast_ref);
-		result = zval_update_constant_ex(ret, scope);
-	} else {
-		result = zval_update_constant_ex(ret, scope);
 	}
-	if (result != SUCCESS) {
+	if (SUCCESS != zval_update_constant_ex(ret, scope)) {
 		zval_ptr_dtor(ret);
 		return FAILURE;
 	}

Zend/zend_compile.c

@@ -9437,6 +9437,7 @@ static void zend_compile_const_decl(zend_ast *ast) /* {{{ */
 			attributes_ast = const_ast;
 			continue;
 		}
+		ZEND_ASSERT(const_ast->kind == ZEND_AST_CONST_ELEM);
 		zend_ast *name_ast = const_ast->child[0];
 		zend_ast **value_ast_ptr = &const_ast->child[1];
 		zend_string *unqualified_name = zend_ast_get_str(name_ast);

Zend/zend_constants.c

@@ -565,7 +565,7 @@ void zend_constant_add_attributes(zend_constant *c, zval *attributes_ast) {
 	zend_attribute *deprecated_attribute = zend_get_attribute_str(
 		c->attributes,
 		"deprecated",
-		sizeof("deprecated")-1
+		strlen("deprecated")
 	);
 
 	if (deprecated_attribute) {

ext/reflection/tests/ReflectionConstant_getAttributes.phpt

@@ -12,7 +12,7 @@ var_dump($reflectionConstant->getAttributes());
 --EXPECTF--
 array(1) {
   [0]=>
-  object(ReflectionAttribute)#2 (1) {
+  object(ReflectionAttribute)#%d (1) {
     ["name"]=>
     string(3) "Foo"
   }