Eagerly evaluate class constants / statics

Author: nikic

Zend/tests/enum/case-attributes.phpt

@@ -19,7 +19,7 @@ var_dump((new \ReflectionClassConstant(Foo::class, 'Bar'))->getAttributes(EnumCa
 
 ?>
 --EXPECT--
-object(EnumCaseAttribute)#1 (1) {
+object(EnumCaseAttribute)#2 (1) {
   ["value"]=>
   string(3) "Bar"
 }

Zend/tests/enum/name-property.phpt

@@ -23,7 +23,7 @@ var_dump(IntFoo::Bar->name);
 --EXPECT--
 array(1) {
   [0]=>
-  object(ReflectionProperty)#2 (2) {
+  object(ReflectionProperty)#6 (2) {
     ["name"]=>
     string(4) "name"
     ["class"]=>
@@ -33,14 +33,14 @@ array(1) {
 string(3) "Bar"
 array(2) {
   [0]=>
-  object(ReflectionProperty)#3 (2) {
+  object(ReflectionProperty)#5 (2) {
     ["name"]=>
     string(4) "name"
     ["class"]=>
     string(6) "IntFoo"
   }
   [1]=>
-  object(ReflectionProperty)#4 (2) {
+  object(ReflectionProperty)#7 (2) {
     ["name"]=>
     string(5) "value"
     ["class"]=>

Zend/zend_inheritance.c

@@ -2710,6 +2710,9 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 					}
 					zv = zend_hash_find_ex(CG(class_table), key, 1);
 					Z_CE_P(zv) = ret;
+					if (!(ce->ce_flags & ZEND_ACC_TRAIT)) {
+						zend_update_class_constants(ret);
+					}
 					return ret;
 				}
 			} else {
@@ -2831,6 +2834,9 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 		free_alloca(traits_and_interfaces, use_heap);
 	}
 
+	if (!(ce->ce_flags & ZEND_ACC_TRAIT)) {
+		zend_update_class_constants(ce);
+	}
 	return ce;
 }
 /* }}} */

ext/reflection/tests/ReflectionEnum_getCase.phpt

@@ -32,15 +32,15 @@ test(IntEnum::class, 'Baz');
 
 ?>
 --EXPECT--
-object(ReflectionEnumUnitCase)#2 (2) {
+object(ReflectionEnumUnitCase)#4 (2) {
   ["name"]=>
   string(3) "Foo"
   ["class"]=>
   string(5) "Enum_"
 }
 ReflectionException: Enum_::Bar is not a case
 ReflectionException: Case Enum_::Baz does not exist
-object(ReflectionEnumBackedCase)#2 (2) {
+object(ReflectionEnumBackedCase)#4 (2) {
   ["name"]=>
   string(3) "Foo"
   ["class"]=>

ext/reflection/tests/ReflectionEnum_getCases.phpt

@@ -22,14 +22,14 @@ var_dump((new ReflectionEnum(IntEnum::class))->getCases());
 --EXPECT--
 array(2) {
   [0]=>
-  object(ReflectionEnumUnitCase)#2 (2) {
+  object(ReflectionEnumUnitCase)#6 (2) {
     ["name"]=>
     string(3) "Foo"
     ["class"]=>
     string(5) "Enum_"
   }
   [1]=>
-  object(ReflectionEnumUnitCase)#3 (2) {
+  object(ReflectionEnumUnitCase)#7 (2) {
     ["name"]=>
     string(3) "Bar"
     ["class"]=>
@@ -38,14 +38,14 @@ array(2) {
 }
 array(2) {
   [0]=>
-  object(ReflectionEnumBackedCase)#2 (2) {
+  object(ReflectionEnumBackedCase)#6 (2) {
     ["name"]=>
     string(3) "Foo"
     ["class"]=>
     string(7) "IntEnum"
   }
   [1]=>
-  object(ReflectionEnumBackedCase)#1 (2) {
+  object(ReflectionEnumBackedCase)#5 (2) {
     ["name"]=>
     string(3) "Bar"
     ["class"]=>