Skip to content

Commit 865fb35

Browse files
authored
Rename Fiber::this() to Fiber::getCurrent() (#7155)
1 parent c5f9cde commit 865fb35

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

Zend/tests/fibers/fiber-this.phpt renamed to Zend/tests/fibers/fiber-get-current.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
--TEST--
2-
Fiber::this()
2+
Fiber::getCurrent()
33
--FILE--
44
<?php
55

6-
var_dump(Fiber::this());
6+
var_dump(Fiber::getCurrent());
77

88
$fiber = new Fiber(function (): void {
9-
var_dump(Fiber::this());
9+
var_dump(Fiber::getCurrent());
1010
});
1111

1212
$fiber->start();

Zend/tests/fibers/fiber-status.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Fiber status methods
44
<?php
55

66
$fiber = new Fiber(function (): void {
7-
$fiber = Fiber::this();
7+
$fiber = Fiber::getCurrent();
88
echo "\nWithin Fiber:\n";
99
var_dump($fiber->isStarted());
1010
var_dump($fiber->isRunning());

Zend/tests/fibers/resume-previous-fiber.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Resume previous fiber
44
<?php
55

66
$fiber = new Fiber(function (): void {
7-
$fiber1 = Fiber::this();
7+
$fiber1 = Fiber::getCurrent();
88

99
$fiber2 = new Fiber(function () use ($fiber1): void {
1010
$fiber1->resume();

Zend/tests/fibers/resume-running-fiber.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Resume running fiber
44
<?php
55

66
$fiber = new Fiber(function (): void {
7-
$self = Fiber::this();
7+
$self = Fiber::getCurrent();
88
$self->resume();
99
});
1010

Zend/zend_fibers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ ZEND_METHOD(Fiber, getReturn)
796796
RETURN_THROWS();
797797
}
798798

799-
ZEND_METHOD(Fiber, this)
799+
ZEND_METHOD(Fiber, getCurrent)
800800
{
801801
ZEND_PARSE_PARAMETERS_NONE();
802802

Zend/zend_fibers.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function isTerminated(): bool {}
2323

2424
public function getReturn(): mixed {}
2525

26-
public static function this(): ?Fiber {}
26+
public static function getCurrent(): ?Fiber {}
2727

2828
public static function suspend(mixed $value = null): mixed {}
2929
}

Zend/zend_fibers_arginfo.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 5f63019ce24efa7b5426f172d68a0f9f705a3bd5 */
2+
* Stub hash: 7a3a7030f97d2c1e787499ef25341607841a607c */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Fiber___construct, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
@@ -29,7 +29,7 @@ ZEND_END_ARG_INFO()
2929
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Fiber_getReturn, 0, 0, IS_MIXED, 0)
3030
ZEND_END_ARG_INFO()
3131

32-
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Fiber_this, 0, 0, Fiber, 1)
32+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Fiber_getCurrent, 0, 0, Fiber, 1)
3333
ZEND_END_ARG_INFO()
3434

3535
#define arginfo_class_Fiber_suspend arginfo_class_Fiber_resume
@@ -47,7 +47,7 @@ ZEND_METHOD(Fiber, isSuspended);
4747
ZEND_METHOD(Fiber, isRunning);
4848
ZEND_METHOD(Fiber, isTerminated);
4949
ZEND_METHOD(Fiber, getReturn);
50-
ZEND_METHOD(Fiber, this);
50+
ZEND_METHOD(Fiber, getCurrent);
5151
ZEND_METHOD(Fiber, suspend);
5252
ZEND_METHOD(FiberError, __construct);
5353

@@ -62,7 +62,7 @@ static const zend_function_entry class_Fiber_methods[] = {
6262
ZEND_ME(Fiber, isRunning, arginfo_class_Fiber_isRunning, ZEND_ACC_PUBLIC)
6363
ZEND_ME(Fiber, isTerminated, arginfo_class_Fiber_isTerminated, ZEND_ACC_PUBLIC)
6464
ZEND_ME(Fiber, getReturn, arginfo_class_Fiber_getReturn, ZEND_ACC_PUBLIC)
65-
ZEND_ME(Fiber, this, arginfo_class_Fiber_this, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
65+
ZEND_ME(Fiber, getCurrent, arginfo_class_Fiber_getCurrent, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
6666
ZEND_ME(Fiber, suspend, arginfo_class_Fiber_suspend, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
6767
ZEND_FE_END
6868
};

ext/reflection/tests/ReflectionFiber_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ReflectionFiber basic tests
44
<?php
55

66
$callable = function (): void {
7-
$reflection = new ReflectionFiber(Fiber::this());
7+
$reflection = new ReflectionFiber(Fiber::getCurrent());
88
echo "\nWithin Fiber:\n";
99
var_dump($reflection->getExecutingFile());
1010
var_dump($reflection->getExecutingLine());

0 commit comments

Comments
 (0)