reflection: Fix ReflectionFunction::getShortName() for Closures (#14001)

see #13550
php · Apr 19, 2024 · d03d436 · d03d436
1 parent 2447cb2
commit d03d436
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/Zend/tests/closure_067.phpt b/Zend/tests/closure_067.phpt
@@ -0,0 +1,20 @@
+--TEST--
+ReflectionFunction::getShortName() returns the full name for closures defined in namespaces.
+--FILE--
+<?php
+namespace Foo;
+
+class Bar {
+	public function baz() {
+		return function () {
+
+		};
+	}
+}
+
+$c = (new Bar())->baz();
+$r = new \ReflectionFunction($c);
+var_dump($r->getShortName());
+?>
+--EXPECT--
+string(26) "{closure:Foo\Bar::baz():6}"
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -3609,10 +3609,13 @@ ZEND_METHOD(ReflectionFunctionAbstract, getShortName)
 	GET_REFLECTION_OBJECT_PTR(fptr);
 
 	zend_string *name = fptr->common.function_name;
-	const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
-	if (backslash) {
-		RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1));
+	if (!(fptr->common.fn_flags & ZEND_ACC_CLOSURE)) {
+		const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
+		if (backslash) {
+			RETURN_STRINGL(backslash + 1, ZSTR_LEN(name) - (backslash - ZSTR_VAL(name) + 1));
+		}
 	}
+
 	RETURN_STR_COPY(name);
 }
 /* }}} */