Skip to content

Commit

Permalink
Fix attribute target validation on fake closures
Browse files Browse the repository at this point in the history
Fixes phpGH-8982
Closes phpGH-9173
  • Loading branch information
iluuu1994 committed Jul 29, 2022
1 parent dd241c0 commit 565a416
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 1 deletion.
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ PHP NEWS
- Reflection:
. Fixed bug GH-8943 (Fixed Reflection::getModifiersNames() with readonly
modifier). (Pierrick)
. Fixed bug GH-8982 (Attribute with TARGET_METHOD is rejected on fake
closure of method). (ilutov)

- Standard:
. Fixed the crypt_sha256/512 api build with clang > 12. (David Carlier)
Expand Down
2 changes: 1 addition & 1 deletion ext/reflection/php_reflection.c
Original file line number Diff line number Diff line change
Expand Up @@ -1882,7 +1882,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getAttributes)

GET_REFLECTION_OBJECT_PTR(fptr);

if (fptr->common.scope && !(fptr->common.fn_flags & ZEND_ACC_CLOSURE)) {
if (fptr->common.scope && (fptr->common.fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_FAKE_CLOSURE)) != ZEND_ACC_CLOSURE) {
target = ZEND_ATTRIBUTE_TARGET_METHOD;
} else {
target = ZEND_ATTRIBUTE_TARGET_FUNCTION;
Expand Down
52 changes: 52 additions & 0 deletions ext/reflection/tests/gh8982.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
--TEST--
GH-8982 (Attribute target validation fails when read via ReflectionFunction)
--FILE--
<?php

#[Attribute(Attribute::TARGET_FUNCTION)]
class F
{
}

#[Attribute(Attribute::TARGET_METHOD)]
class M
{
}

class C
{
#[F]
#[M]
public function m()
{
}
}

#[F]
#[M]
function f() {}

function test(string $attributeClass, $value) {
try {
var_dump((new ReflectionFunction($value))->getAttributes($attributeClass)[0]->newInstance());
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
}

$m = [new C(), 'm'](...);
$f = f(...);

test(F::class, $f);
test(M::class, $f);
test(F::class, $m);
test(M::class, $m);

?>
--EXPECT--
object(F)#4 (0) {
}
Attribute "M" cannot target function (allowed targets: method)
Attribute "F" cannot target method (allowed targets: function)
object(M)#4 (0) {
}

0 comments on commit 565a416

Please sign in to comment.