diff --git a/Zend/tests/fibers/fiber-this.phpt b/Zend/tests/fibers/fiber-get-current.phpt similarity index 60% rename from Zend/tests/fibers/fiber-this.phpt rename to Zend/tests/fibers/fiber-get-current.phpt index 714a848f0aad0..8abcf69e52cf6 100644 --- a/Zend/tests/fibers/fiber-this.phpt +++ b/Zend/tests/fibers/fiber-get-current.phpt @@ -1,12 +1,12 @@ --TEST-- -Fiber::this() +Fiber::getCurrent() --FILE-- start(); diff --git a/Zend/tests/fibers/fiber-status.phpt b/Zend/tests/fibers/fiber-status.phpt index 92c37a2ef67ba..090c8349da936 100644 --- a/Zend/tests/fibers/fiber-status.phpt +++ b/Zend/tests/fibers/fiber-status.phpt @@ -4,7 +4,7 @@ Fiber status methods isStarted()); var_dump($fiber->isRunning()); diff --git a/Zend/tests/fibers/resume-previous-fiber.phpt b/Zend/tests/fibers/resume-previous-fiber.phpt index bcdc11ab139f5..4865ef236f349 100644 --- a/Zend/tests/fibers/resume-previous-fiber.phpt +++ b/Zend/tests/fibers/resume-previous-fiber.phpt @@ -4,7 +4,7 @@ Resume previous fiber resume(); diff --git a/Zend/tests/fibers/resume-running-fiber.phpt b/Zend/tests/fibers/resume-running-fiber.phpt index ca52d50c6946b..4295f7f918c07 100644 --- a/Zend/tests/fibers/resume-running-fiber.phpt +++ b/Zend/tests/fibers/resume-running-fiber.phpt @@ -4,7 +4,7 @@ Resume running fiber resume(); }); diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c index 1ddf25a0c714f..b16da3af1714a 100644 --- a/Zend/zend_fibers.c +++ b/Zend/zend_fibers.c @@ -755,7 +755,7 @@ ZEND_METHOD(Fiber, getReturn) RETURN_THROWS(); } -ZEND_METHOD(Fiber, this) +ZEND_METHOD(Fiber, getCurrent) { ZEND_PARSE_PARAMETERS_NONE(); diff --git a/Zend/zend_fibers.stub.php b/Zend/zend_fibers.stub.php index aa22362efb354..cf18193056f1e 100644 --- a/Zend/zend_fibers.stub.php +++ b/Zend/zend_fibers.stub.php @@ -23,7 +23,7 @@ public function isTerminated(): bool {} public function getReturn(): mixed {} - public static function this(): ?Fiber {} + public static function getCurrent(): ?Fiber {} public static function suspend(mixed $value = null): mixed {} } diff --git a/Zend/zend_fibers_arginfo.h b/Zend/zend_fibers_arginfo.h index 49211b138c4bc..51b751a4f20ea 100644 --- a/Zend/zend_fibers_arginfo.h +++ b/Zend/zend_fibers_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 5f63019ce24efa7b5426f172d68a0f9f705a3bd5 */ + * Stub hash: 7a3a7030f97d2c1e787499ef25341607841a607c */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Fiber___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0) @@ -29,7 +29,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Fiber_getReturn, 0, 0, IS_MIXED, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Fiber_this, 0, 0, Fiber, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Fiber_getCurrent, 0, 0, Fiber, 1) ZEND_END_ARG_INFO() #define arginfo_class_Fiber_suspend arginfo_class_Fiber_resume @@ -47,7 +47,7 @@ ZEND_METHOD(Fiber, isSuspended); ZEND_METHOD(Fiber, isRunning); ZEND_METHOD(Fiber, isTerminated); ZEND_METHOD(Fiber, getReturn); -ZEND_METHOD(Fiber, this); +ZEND_METHOD(Fiber, getCurrent); ZEND_METHOD(Fiber, suspend); ZEND_METHOD(FiberError, __construct); @@ -62,7 +62,7 @@ static const zend_function_entry class_Fiber_methods[] = { ZEND_ME(Fiber, isRunning, arginfo_class_Fiber_isRunning, ZEND_ACC_PUBLIC) ZEND_ME(Fiber, isTerminated, arginfo_class_Fiber_isTerminated, ZEND_ACC_PUBLIC) ZEND_ME(Fiber, getReturn, arginfo_class_Fiber_getReturn, ZEND_ACC_PUBLIC) - ZEND_ME(Fiber, this, arginfo_class_Fiber_this, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + ZEND_ME(Fiber, getCurrent, arginfo_class_Fiber_getCurrent, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) ZEND_ME(Fiber, suspend, arginfo_class_Fiber_suspend, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) ZEND_FE_END }; diff --git a/ext/reflection/tests/ReflectionFiber_basic.phpt b/ext/reflection/tests/ReflectionFiber_basic.phpt index cd332fad7ebc6..a81c05c98e884 100644 --- a/ext/reflection/tests/ReflectionFiber_basic.phpt +++ b/ext/reflection/tests/ReflectionFiber_basic.phpt @@ -4,7 +4,7 @@ ReflectionFiber basic tests getExecutingFile()); var_dump($reflection->getExecutingLine());