Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Closure::getCurrent() to retrieve current closure #18167

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+89 −1
Draft

Implement Closure::getCurrent() to retrieve current closure #18167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c90fd3b
Implement Closure::getCurrent() to retrieve current closure
iluuu1994 Mar 28, 2025
b7e5c53
Fix for fake closures
iluuu1994 Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions Zend/tests/closures/closure_get_current.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
--TEST--
Closure::getCurrent()
--FILE--
<?php

$i = 1;

$c = function ($p) use (&$i) {
$self = Closure::getCurrent();
var_dump($p, $i);
$i++;
if ($p < 10) {
$self($p + 1);
}
};

$c(1);
var_dump($i);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closure in attribute should be tested as well.

Also probably a "fail" in class method and no function in global context.

function fail() {
Closure::getCurrent();
}

try {
fail();
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

function foo() {
var_dump(Closure::getCurrent());
}

try {
foo(...)();
} catch (Error $e) {
echo $e->getMessage(), "\n";
}

?>
--EXPECT--
int(1)
int(1)
int(2)
int(2)
int(3)
int(3)
int(4)
int(4)
int(5)
int(5)
int(6)
int(6)
int(7)
int(7)
int(8)
int(8)
int(9)
int(9)
int(10)
int(10)
int(11)
Current function is not a closure
Current function is not a closure
17 changes: 17 additions & 0 deletions Zend/zend_closures.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,23 @@ ZEND_METHOD(Closure, fromCallable)
}
/* }}} */

ZEND_METHOD(Closure, getCurrent)
{
ZEND_PARSE_PARAMETERS_NONE();

zend_execute_data *prev_ex = EX(prev_execute_data);

if (!prev_ex
|| !prev_ex->func
|| (prev_ex->func->common.fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_FAKE_CLOSURE)) != ZEND_ACC_CLOSURE) {
zend_throw_error(NULL, "Current function is not a closure");
RETURN_THROWS();
}

zend_object *obj = ZEND_CLOSURE_OBJECT(prev_ex->func);
RETURN_OBJ_COPY(obj);
}

static ZEND_COLD zend_function *zend_closure_get_constructor(zend_object *object) /* {{{ */
{
zend_throw_error(NULL, "Instantiation of class Closure is not allowed");
Expand Down
2 changes: 2 additions & 0 deletions Zend/zend_closures.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ public function bindTo(?object $newThis, object|string|null $newScope = "static"
public function call(object $newThis, mixed ...$args): mixed {}

public static function fromCallable(callable $callback): Closure {}

public static function getCurrent(): Closure {}
}
7 changes: 6 additions & 1 deletion Zend/zend_closures_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading