Add very simple compiler attribute validation for now (no constant ast evaluation).

Author: beberlei

Zend/tests/attributes/compiler_attributes.phpt

@@ -11,5 +11,4 @@ class Foo
 $ref = new ReflectionClass(Foo::class);
 var_dump($ref->getAttributes()[0]->getAsObject());
 --EXPECTF--
-object(PhpCompilerAttribute)#3 (0) {
-}
+Fatal error: The PhpCompilerAttribute can only be used by internal classes, use PhpAttribute instead in %s

Zend/zend_attributes.h

@@ -0,0 +1,16 @@
+#ifndef ZEND_ATTRIBUTES_H
+#define ZEND_ATTRIBUTES_H
+
+zend_class_entry *zend_ce_php_attribute;
+zend_class_entry *zend_ce_php_compiler_attribute;
+
+typedef void (*zend_attributes_internal_validator)(zval *attribute);
+HashTable zend_attributes_internal_validators;
+
+static void zend_compiler_attribute_register(zend_class_entry *ce, zend_attributes_internal_validator *validator)
+{
+	zend_string *attribute_name = zend_string_tolower_ex(ce->name, 1);
+
+	zend_hash_update_mem(&zend_attributes_internal_validators, attribute_name, validator, sizeof(zend_attributes_internal_validator));
+}
+#endif

Zend/zend_compile.c

@@ -20,6 +20,7 @@
 
 #include <zend_language_parser.h>
 #include "zend.h"
+#include "zend_attributes.h"
 #include "zend_compile.h"
 #include "zend_constants.h"
 #include "zend_llist.h"
@@ -5750,6 +5751,8 @@ static HashTable *zend_compile_attributes(zend_ast *ast) /* {{{ */
 	uint32_t i;
 
 	zval tmp;
+	zend_attributes_internal_validator *validator = NULL;
+	zend_attributes_internal_validator cb;
 
 	ZVAL_NULL(&tmp);
 
@@ -5770,6 +5773,14 @@ static HashTable *zend_compile_attributes(zend_ast *ast) /* {{{ */
 		name = zend_string_tolower(Z_STR_P(zend_hash_index_find(Z_ARRVAL(a), 0)));
 		x = zend_hash_find(attr, name);
 
+		// validate internal attribute
+		validator = (zend_attributes_internal_validator*)zend_hash_find_ptr(&zend_attributes_internal_validators, name);
+
+		if (validator != NULL) {
+			cb = *validator;
+			cb(&a);
+		}
+
 		if (x) {
 			ZEND_ASSERT(Z_TYPE_P(x) == IS_ARRAY);
 

Zend/zend_default_classes.c

@@ -19,33 +19,43 @@
 
 #include "zend.h"
 #include "zend_API.h"
+#include "zend_attributes.h"
 #include "zend_builtin_functions.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 #include "zend_closures.h"
 #include "zend_generators.h"
 #include "zend_weakrefs.h"
 
-zend_class_entry *zend_ce_php_attribute;
-zend_class_entry *zend_ce_php_compiler_attribute;
+void zend_attribute_validate_phpattribute(zval *attribute)
+{
+}
+
+void zend_attribute_validate_phpcompilerattribute(zval *attribute)
+{
+	zend_error(E_COMPILE_ERROR, "The PhpCompilerAttribute can only be used by internal classes, use PhpAttribute instead");
+}
 
 static void zend_register_attribute_ce(void)
 {
+	zend_hash_init(&zend_attributes_internal_validators, 8, NULL, NULL, 1);
+
 	zend_class_entry ce;
+	zend_attributes_internal_validator cb;
 
 	INIT_CLASS_ENTRY(ce, "PhpAttribute", NULL);
 	zend_ce_php_attribute = zend_register_internal_class(&ce);
 	zend_ce_php_attribute->ce_flags |= ZEND_ACC_FINAL;
 
-	//zend_hash_init_ex(zend_ce_php_attribute->attributes, 8, NULL, NULL, 1, 0);
-	//zend_hash_str_add_empty_element(zend_ce_php_attribute->attributes, "phpattribute", sizeof("phpattribute")-1);
+	cb = zend_attribute_validate_phpattribute;
+	zend_compiler_attribute_register(zend_ce_php_attribute, &cb);
 
 	INIT_CLASS_ENTRY(ce, "PhpCompilerAttribute", NULL);
 	zend_ce_php_compiler_attribute = zend_register_internal_class(&ce);
 	zend_ce_php_compiler_attribute->ce_flags |= ZEND_ACC_FINAL;
 
-	//zend_hash_init_ex(zend_ce_php_attribute->attributes, 8, NULL, NULL, 1, 0);
-	//zend_hash_str_add_empty_element(zend_ce_php_attribute->attributes, "phpattribute", sizeof("phpattribute")-1);
+	cb = zend_attribute_validate_phpcompilerattribute;
+	zend_compiler_attribute_register(zend_ce_php_compiler_attribute, &cb);
 }
 
 ZEND_API void zend_register_default_classes(void)