make sure we lift exceptions up the call stack

mattdinthehouse · mattdinthehouse · commit cc1be750c321 · 2025-08-14T21:42:37.000+10:00
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -5156,7 +5156,7 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)
 	}
 
 	if (UNEXPECTED(object_init_ex(return_value, ce) != SUCCESS)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	ZEND_HASH_FOREACH_STR_KEY_VAL(data, key, val) {
@@ -5181,9 +5181,11 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)
 
 		if (EG(exception)) {
 			zend_object_store_ctor_failed(Z_OBJ_P(return_value));
+			RETURN_THROWS();
 		}
 	} else if (argc) {
 		zend_throw_exception_ex(reflection_exception_ptr, 0, "Class %s does not have a constructor, so you cannot pass any constructor arguments", ZSTR_VAL(ce->name));
+		RETURN_THROWS();
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -5156,7 +5156,7 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)`
`5156`	`5156`	`}`
`5157`	`5157`
`5158`	`5158`	`if (UNEXPECTED(object_init_ex(return_value, ce) != SUCCESS)) {`
`5159`		`- return;`
	`5159`	`+ RETURN_THROWS();`
`5160`	`5160`	`}`
`5161`	`5161`
`5162`	`5162`	`ZEND_HASH_FOREACH_STR_KEY_VAL(data, key, val) {`
`@@ -5181,9 +5181,11 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)`
`5181`	`5181`
`5182`	`5182`	`if (EG(exception)) {`
`5183`	`5183`	`zend_object_store_ctor_failed(Z_OBJ_P(return_value));`
	`5184`	`+ RETURN_THROWS();`
`5184`	`5185`	`}`
`5185`	`5186`	`} else if (argc) {`
`5186`	`5187`	`zend_throw_exception_ex(reflection_exception_ptr, 0, "Class %s does not have a constructor, so you cannot pass any constructor arguments", ZSTR_VAL(ce->name));`
	`5188`	`+ RETURN_THROWS();`
`5187`	`5189`	`}`
`5188`	`5190`	`}`
`5189`	`5191`	`/* }}} */`