More tests

Author: DanielEScherzer

Zend/tests/attributes/class_alias/attributes_array_contains_non-object.phpt

@@ -0,0 +1,17 @@
+--TEST--
+#[ClassAlias] - attributes parameter validated at compile time (non-object in array)
+--FILE--
+<?php
+
+#[ClassAlias('Other', [true, new MissingAttribute()])]
+class Demo {}
+
+$ref = new ReflectionClass( 'Demo' );
+$attrib = $ref->getAttributes()[0];
+var_dump( $attrib );
+
+$attrib->newInstance();
+
+?>
+--EXPECTF--
+Fatal error: Attribute must be declared with `new` in %s on line %d

Zend/tests/attributes/class_alias/attributes_array_non-object.phpt

@@ -0,0 +1,17 @@
+--TEST--
+#[ClassAlias] - attributes parameter validated at compile time (array can be evaluated)
+--FILE--
+<?php
+
+#[ClassAlias('Other', [true])]
+class Demo {}
+
+$ref = new ReflectionClass( 'Demo' );
+$attrib = $ref->getAttributes()[0];
+var_dump( $attrib );
+
+$attrib->newInstance();
+
+?>
+--EXPECTF--
+Fatal error: ClassAlias::__construct(): Argument #2 ($attributes) must be an array of objects in %s on line %d

Zend/tests/attributes/class_alias/runtime_attributes_validation_missing.phpt

@@ -0,0 +1,26 @@
+--TEST--
+#[ClassAlias] - attributes parameter validated at runtime (missing class)
+--FILE--
+<?php
+
+#[ClassAlias('Other', [new MissingAttribute()])]
+class Demo {}
+
+$ref = new ReflectionClass( 'Demo' );
+$attrib = $ref->getAttributes()[0];
+var_dump( $attrib );
+
+$attrib->newInstance();
+
+?>
+--EXPECTF--
+object(ReflectionAttribute)#%d (1) {
+  ["name"]=>
+  string(10) "ClassAlias"
+}
+
+Fatal error: Uncaught Error: Class "MissingAttribute" not found in %s:%d
+Stack trace:
+#0 %s(%d): ReflectionAttribute->newInstance()
+#1 {main}
+  thrown in %s on line %d

Zend/tests/attributes/class_alias/runtime_attributes_validation_non-attribute.phpt

@@ -0,0 +1,26 @@
+--TEST--
+#[ClassAlias] - attributes parameter value types not validated when constructing ClassAlias
+--FILE--
+<?php
+
+class NonAttribute {}
+
+#[ClassAlias('Other', [new NonAttribute()])]
+class Demo {}
+
+$ref = new ReflectionClass( 'Demo' );
+$attrib = $ref->getAttributes()[0];
+var_dump( $attrib );
+
+var_dump( $attrib->newInstance() );
+
+?>
+--EXPECTF--
+object(ReflectionAttribute)#%d (1) {
+  ["name"]=>
+  string(10) "ClassAlias"
+}
+object(ClassAlias)#%d (1) {
+  ["alias"]=>
+  string(5) "Other"
+}

Zend/zend_attributes.c

@@ -355,14 +355,23 @@ static void validate_class_alias(
 		}
 		ZEND_ASSERT(nested_attribs != NULL);
 		if (UNEXPECTED(!Z_OPT_CONSTANT_P(nested_attribs))) {
-			zend_wrong_parameter_error(
-				ZPP_ERROR_WRONG_ARG,
-				2,
-				"attributes",
-				Z_EXPECTED_ARRAY,
-				nested_attribs
-			);
-			// Something with an invalid parameter
+			// If it is an array, then it must be an array that can be evaluated
+			// already
+			if (Z_TYPE_P(nested_attribs) == IS_ARRAY) {
+				zend_argument_type_error(
+					2,
+					"must be an array of objects"
+				);
+			} else {
+				zend_wrong_parameter_error(
+					ZPP_ERROR_WRONG_ARG,
+					2,
+					"attributes",
+					Z_EXPECTED_ARRAY,
+					nested_attribs
+				);
+				// Something with an invalid parameter
+			}
 		} else {
 			zend_ast *attributes_ast = Z_ASTVAL_P(nested_attribs);
 			compile_alias_attributes(&( alias_obj->attributes), attributes_ast);