Fix #81681: ReflectionEnum throwing exceptions

cmb69 · cmb69 · commit 59dd4fd742dd · 2021-12-02T23:22:07.000+01:00
Enums are neither instantiable nor cloneable. Closes phpGH-7707.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.2
 
+- Reflection:
+  . Fixed bug #81681 (ReflectionEnum throwing exceptions). (cmb)
 
 02 Dec 2021, PHP 8.1.1
 
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -4751,7 +4751,7 @@ ZEND_METHOD(ReflectionClass, isInstantiable)
 		RETURN_THROWS();
 	}
 	GET_REFLECTION_OBJECT_PTR(ce);
-	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) {
+	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM)) {
 		RETURN_FALSE;
 	}
 
@@ -4776,7 +4776,7 @@ ZEND_METHOD(ReflectionClass, isCloneable)
 		RETURN_THROWS();
 	}
 	GET_REFLECTION_OBJECT_PTR(ce);
-	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) {
+	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM)) {
 		RETURN_FALSE;
 	}
 	if (!Z_ISUNDEF(intern->obj)) {
diff --git a/ext/reflection/tests/bug81681.phpt b/ext/reflection/tests/bug81681.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #81681 (ReflectionEnum throwing exceptions)
+--FILE--
+<?php
+enum Status
+{
+    case Draft;
+    case Published;
+    case Archived;
+}
+
+$reflectionEnum = new \ReflectionEnum('\Status');
+var_dump($reflectionEnum->isInstantiable());
+var_dump($reflectionEnum->isCloneable());
+?>
+--EXPECT--
+bool(false)
+bool(false)

Original file line number	Diff line number	Diff line change
`@@ -4751,7 +4751,7 @@ ZEND_METHOD(ReflectionClass, isInstantiable)`
`4751`	`4751`	`RETURN_THROWS();`
`4752`	`4752`	`}`
`4753`	`4753`	`GET_REFLECTION_OBJECT_PTR(ce);`
`4754`		`- if (ce->ce_flags & (ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) {`
	`4754`	`+ if (ce->ce_flags & (ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \| ZEND_ACC_ENUM)) {`
`4755`	`4755`	`RETURN_FALSE;`
`4756`	`4756`	`}`
`4757`	`4757`
`@@ -4776,7 +4776,7 @@ ZEND_METHOD(ReflectionClass, isCloneable)`
`4776`	`4776`	`RETURN_THROWS();`
`4777`	`4777`	`}`
`4778`	`4778`	`GET_REFLECTION_OBJECT_PTR(ce);`
`4779`		`- if (ce->ce_flags & (ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) {`
	`4779`	`+ if (ce->ce_flags & (ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \| ZEND_ACC_ENUM)) {`
`4780`	`4780`	`RETURN_FALSE;`
`4781`	`4781`	`}`
`4782`	`4782`	`if (!Z_ISUNDEF(intern->obj)) {`