php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  reflection: Fix the return value of ReflectionFunction::{getNamespaceName,inNamespace}() for closures (#16129)
This commit is contained in:
Tim Düsterhus
2024-09-30 16:34:55 +02:00
parent 7a8b1f683b a1cc091808
commit 624d0a89ae
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Zend/tests/closure_067.phpt
View File

@@ -1,5 +1,5 @@
--TEST--
ReflectionFunction::getShortName() returns the full name for closures defined in namespaces.
ReflectionFunction::get{Short,Namespace}Name() and inNamespace() return the correct data for closures defined in namespaces.
--FILE--
<?php
namespace Foo;
@@ -14,7 +14,17 @@ class Bar {
$c = (new Bar())->baz();
$r = new \ReflectionFunction($c);
// Closures are not inside of a namespace, thus the short name is the full name.
var_dump($r->getShortName());
// The namespace is empty.
var_dump($r->getNamespaceName());
// The function is not inside of a namespace.
var_dump($r->inNamespace());
// And the namespace name + the short name together must be the full name.
var_dump($r->getNamespaceName() . ($r->inNamespace() ? '\\' : '') . $r->getShortName() === $r->getName());
?>
--EXPECT--
string(26) "{closure:Foo\Bar::baz():6}"
string(0) ""
bool(false)
bool(true)

16
Zend/tests/closure_068.phpt
View File

@@ -1,5 +1,5 @@
--TEST--
ReflectionFunction::getShortName() returns the short name for first class callables defined in namespaces.
ReflectionFunction::get{Short,Namespace}Name() and inNamespace() return the correct data for first class callables defined in namespaces.
--FILE--
<?php
namespace Foo;
@@ -7,7 +7,21 @@ namespace Foo;
function foo() {
}
$r = new \ReflectionFunction(foo(...));
$r2 = new \ReflectionFunction('Foo\\foo');
var_dump($r->getShortName());
var_dump($r->getNamespaceName());
var_dump($r->inNamespace());
var_dump($r->getNamespaceName() . ($r->inNamespace() ? '\\' : '') . $r->getShortName() === $r->getName());
var_dump($r->getShortName() === $r2->getShortName());
var_dump($r->getNamespaceName() === $r2->getNamespaceName());
var_dump($r->inNamespace() === $r2->inNamespace());
?>
--EXPECT--
string(3) "foo"
string(3) "Foo"
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)

8
ext/reflection/php_reflection.c
View File

@@ -3584,6 +3584,10 @@ ZEND_METHOD(ReflectionFunctionAbstract, inNamespace)
GET_REFLECTION_OBJECT_PTR(fptr);
if ((fptr->common.fn_flags & (ZEND_ACC_CLOSURE | ZEND_ACC_FAKE_CLOSURE)) == ZEND_ACC_CLOSURE) {
RETURN_FALSE;
}
zend_string *name = fptr->common.function_name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
RETURN_BOOL(backslash);
@@ -3602,6 +3606,10 @@ ZEND_METHOD(ReflectionFunctionAbstract, getNamespaceName)
GET_REFLECTION_OBJECT_PTR(fptr);
if ((fptr->common.fn_flags & (ZEND_ACC_CLOSURE | ZEND_ACC_FAKE_CLOSURE)) == ZEND_ACC_CLOSURE) {
RETURN_EMPTY_STRING();
}
zend_string *name = fptr->common.function_name;
const char *backslash = zend_memrchr(ZSTR_VAL(name), '\\', ZSTR_LEN(name));
if (backslash) {