Ensure that typed class constants work correctly

Author: dktapps

src/copy.c

@@ -452,7 +452,7 @@ static zend_op* pmmpthread_copy_opcodes(zend_op_array *op_array, zval *literals,
 } /* }}} */
 
 /* {{{ */
-static void pmmpthread_copy_zend_type(const zend_type *old_type, zend_type *new_type) {
+void pmmpthread_copy_zend_type(const zend_type *old_type, zend_type *new_type) {
 	memcpy(new_type, old_type, sizeof(zend_type));
 
 	//This code is based on zend_persist_type() in ext/opcache/zend_persist.c

src/copy.h

@@ -21,6 +21,7 @@
 #include <src/pmmpthread.h>
 #include <src/thread.h>
 #include <Zend/zend_attributes.h>
+#include <Zend/zend_types.h>
 #include <src/prepare.h>
 
 /* {{{ */
@@ -32,6 +33,9 @@ int pmmpthread_copy_zval(const pmmpthread_ident_t* owner, zval* dest, zval* sour
 /* {{{ */
 HashTable* pmmpthread_copy_attributes(const pmmpthread_ident_t* owner, HashTable *attributes, zend_string *filename); /* }}} */
 
+/* {{{ */
+void pmmpthread_copy_zend_type(const zend_type* old_type, zend_type* new_type); /* }}} */
+
 /* {{{ */
 zend_function* pmmpthread_copy_function(const pmmpthread_ident_t* owner, const zend_function *function); /* }}} */
 

src/prepare.c

@@ -104,6 +104,11 @@ static void prepare_class_constants(const pmmpthread_ident_t* source, zend_class
 		if (zc->attributes) {
 			rc->attributes = pmmpthread_copy_attributes(source, zc->attributes, zc->ce->type == ZEND_INTERNAL_CLASS ? NULL : zc->ce->info.user.filename);
 		}
+
+#if PHP_VERSION_ID >= 80300
+		pmmpthread_copy_zend_type(&zc->type, &rc->type);
+#endif
+
 	} ZEND_HASH_FOREACH_END();
 } /* }}} */
 
@@ -205,27 +210,7 @@ static void prepare_class_property_table(const pmmpthread_ident_t* source, zend_
 			} else dup->ce = pmmpthread_prepared_entry(source, info->ce);
 		}
 
-		memcpy(&dup->type, &info->type, sizeof(zend_type));
-
-		//This code is based on zend_persist_type() in ext/opcache/zend_persist.c
-		if (ZEND_TYPE_HAS_LIST(info->type)) {
-			const zend_type_list *old_list = ZEND_TYPE_LIST(info->type);
-			zend_type_list *new_list;
-			if (ZEND_TYPE_USES_ARENA(info->type)) {
-				new_list = zend_arena_alloc(&CG(arena), ZEND_TYPE_LIST_SIZE(old_list->num_types));
-			} else {
-				new_list = emalloc(ZEND_TYPE_LIST_SIZE(old_list->num_types));
-			}
-			memcpy(new_list, old_list, ZEND_TYPE_LIST_SIZE(old_list->num_types));
-			ZEND_TYPE_SET_PTR(dup->type, new_list);
-		}
-
-		zend_type *single_type;
-		ZEND_TYPE_FOREACH(dup->type, single_type) {
-			if (ZEND_TYPE_HAS_NAME(*single_type)) {
-				ZEND_TYPE_SET_PTR(*single_type, pmmpthread_copy_string(ZEND_TYPE_NAME(*single_type)));
-			}
-		} ZEND_TYPE_FOREACH_END();
+		pmmpthread_copy_zend_type(&info->type, &dup->type);
 
 		if (info->attributes) {
 			dup->attributes = pmmpthread_copy_attributes(source, info->attributes, info->ce->type == ZEND_INTERNAL_CLASS ? NULL : info->ce->info.user.filename);

tests/typed-class-constants.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Test that class constant types are copied correctly
+--SKIPIF--
+<?php if(PHP_VERSION_ID < 80300) die("skip this test is for 8.3+ only"); ?>
+--FILE--
+<?php
+
+use pmmp\thread\Thread;
+
+class Test{
+	public const int TEST = 1;
+}
+
+$thread = new class extends Thread{
+	public function run() : void{
+		$reflect = new \ReflectionClass(Test::class);
+		$const = $reflect->getReflectionConstant("TEST");
+		var_dump($const->getType()->getName());
+		var_dump($const->getType()->allowsNull());
+	}
+};
+$thread->start(Thread::INHERIT_ALL) && $thread->join();
+?>
+--EXPECT--
+string(3) "int"
+bool(false)