Skip to content

Commit e95a017

Browse files
WyriHaximusclue
WyriHaximus
authored and
clue
committed
Update PHP language syntax and remove legacy workarounds
1 parent d3c1052 commit e95a017

18 files changed

+173
-242
lines changed

‎examples/12-generate-yes.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require __DIR__ . '/../vendor/autoload.php';
66

77
// data can be given as first argument or defaults to "y"
8-
$data = (isset($argv[1]) ? $argv[1] : 'y') . "\n";
8+
$data = ($argv[1] ?? 'y') . "\n";
99

1010
// repeat data X times in order to fill around 200 KB
1111
$data = str_repeat($data, round(200000 / strlen($data)));

‎examples/91-benchmark-ticks.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
require __DIR__ . '/../vendor/autoload.php';
66

7-
$n = isset($argv[1]) ? (int)$argv[1] : 1000 * 100;
7+
$n = (int) ($argv[1] ?? 1000 * 100);
88

99
for ($i = 0; $i < $n; ++$i) {
1010
Loop::futureTick(function () { });

‎examples/92-benchmark-timers.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
require __DIR__ . '/../vendor/autoload.php';
66

7-
$n = isset($argv[1]) ? (int)$argv[1] : 1000 * 100;
7+
$n = (int) ($argv[1] ?? 1000 * 100);
88

99
for ($i = 0; $i < $n; ++$i) {
1010
Loop::addTimer(0, function () { });

‎examples/93-benchmark-ticks-delay.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
require __DIR__ . '/../vendor/autoload.php';
66

7-
$ticks = isset($argv[1]) ? (int)$argv[1] : 1000 * 100;
7+
$ticks = (int) ($argv[1] ?? 1000 * 100);
88
$tick = function () use (&$tick, &$ticks) {
99
if ($ticks > 0) {
1010
--$ticks;

‎examples/94-benchmark-timers-delay.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
require __DIR__ . '/../vendor/autoload.php';
66

7-
$ticks = isset($argv[1]) ? (int)$argv[1] : 1000 * 100;
7+
$ticks = (int) ($argv[1] ?? 1000 * 100);
88
$tick = function () use (&$tick, &$ticks) {
99
if ($ticks > 0) {
1010
--$ticks;

‎examples/95-benchmark-memory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
require __DIR__ . '/../vendor/autoload.php';
1515

1616
$args = getopt('t:l:r:');
17-
$t = isset($args['t']) ? (int)$args['t'] : 0;
17+
$t = (int) ($args['t'] ?? 0);
1818
$loop = isset($args['l']) && class_exists('React\EventLoop\\' . $args['l'] . 'Loop') ? 'React\EventLoop\\' . $args['l'] . 'Loop' : Loop::get();
1919

2020
if (!($loop instanceof LoopInterface)) {
2121
Loop::set(new $loop());
2222
}
2323

24-
$r = isset($args['r']) ? (int)$args['r'] : 2;
24+
$r = (int) ($args['r'] ?? 2);
2525

2626
$runs = 0;
2727

‎src/ExtEvLoop.php

+6-8
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ class ExtEvLoop implements LoopInterface
4141
/**
4242
* @var EvIo[]
4343
*/
44-
private $readStreams = array();
44+
private $readStreams = [];
4545

4646
/**
4747
* @var EvIo[]
4848
*/
49-
private $writeStreams = array();
49+
private $writeStreams = [];
5050

5151
/**
5252
* @var bool
@@ -61,7 +61,7 @@ class ExtEvLoop implements LoopInterface
6161
/**
6262
* @var \EvSignal[]
6363
*/
64-
private $signalEvents = array();
64+
private $signalEvents = [];
6565

6666
public function __construct()
6767
{
@@ -138,13 +138,11 @@ public function addTimer($interval, $callback)
138138
{
139139
$timer = new Timer($interval, $callback, false);
140140

141-
$that = $this;
142-
$timers = $this->timers;
143-
$callback = function () use ($timer, $timers, $that) {
141+
$callback = function () use ($timer) {
144142
\call_user_func($timer->getCallback(), $timer);
145143

146-
if ($timers->contains($timer)) {
147-
$that->cancelTimer($timer);
144+
if ($this->timers->contains($timer)) {
145+
$this->cancelTimer($timer);
148146
}
149147
};
150148

‎src/ExtEventLoop.php

+17-20
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ final class ExtEventLoop implements LoopInterface
2727
private $timerCallback;
2828
private $timerEvents;
2929
private $streamCallback;
30-
private $readEvents = array();
31-
private $writeEvents = array();
32-
private $readListeners = array();
33-
private $writeListeners = array();
34-
private $readRefs = array();
35-
private $writeRefs = array();
30+
private $readEvents = [];
31+
private $writeEvents = [];
32+
private $readListeners = [];
33+
private $writeListeners = [];
34+
private $readRefs = [];
35+
private $writeRefs = [];
3636
private $running;
3737
private $signals;
38-
private $signalEvents = array();
38+
private $signalEvents = [];
3939

4040
public function __construct()
4141
{
@@ -67,8 +67,8 @@ public function __destruct()
6767
$this->timerEvents->detach($timer);
6868
}
6969

70-
$this->readEvents = array();
71-
$this->writeEvents = array();
70+
$this->readEvents = [];
71+
$this->writeEvents = [];
7272
}
7373

7474
public function addReadStream($stream, $listener)
@@ -169,7 +169,7 @@ public function addSignal($signal, $listener)
169169
$this->signals->add($signal, $listener);
170170

171171
if (!isset($this->signalEvents[$signal])) {
172-
$this->signalEvents[$signal] = Event::signal($this->eventBase, $signal, array($this->signals, 'call'));
172+
$this->signalEvents[$signal] = Event::signal($this->eventBase, $signal, [$this->signals, 'call']);
173173
$this->signalEvents[$signal]->add();
174174
}
175175
}
@@ -235,11 +235,10 @@ private function scheduleTimer(TimerInterface $timer)
235235
*/
236236
private function createTimerCallback()
237237
{
238-
$timers = $this->timerEvents;
239-
$this->timerCallback = function ($_, $__, $timer) use ($timers) {
238+
$this->timerCallback = function ($_, $__, $timer) {
240239
\call_user_func($timer->getCallback(), $timer);
241240

242-
if (!$timer->isPeriodic() && $timers->contains($timer)) {
241+
if (!$timer->isPeriodic() && $this->timerEvents->contains($timer)) {
243242
$this->cancelTimer($timer);
244243
}
245244
};
@@ -254,17 +253,15 @@ private function createTimerCallback()
254253
*/
255254
private function createStreamCallback()
256255
{
257-
$read =& $this->readListeners;
258-
$write =& $this->writeListeners;
259-
$this->streamCallback = function ($stream, $flags) use (&$read, &$write) {
256+
$this->streamCallback = function ($stream, $flags) {
260257
$key = (int) $stream;
261258

262-
if (Event::READ === (Event::READ & $flags) && isset($read[$key])) {
263-
\call_user_func($read[$key], $stream);
259+
if (Event::READ === (Event::READ & $flags) && isset($this->readListeners[$key])) {
260+
\call_user_func($this->readListeners[$key], $stream);
264261
}
265262

266-
if (Event::WRITE === (Event::WRITE & $flags) && isset($write[$key])) {
267-
\call_user_func($write[$key], $stream);
263+
if (Event::WRITE === (Event::WRITE & $flags) && isset($this->writeListeners[$key])) {
264+
\call_user_func($this->writeListeners[$key], $stream);
268265
}
269266
};
270267
}

‎src/ExtUvLoop.php

+9-12
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ final class ExtUvLoop implements LoopInterface
2222
private $uv;
2323
private $futureTickQueue;
2424
private $timers;
25-
private $streamEvents = array();
26-
private $readStreams = array();
27-
private $writeStreams = array();
25+
private $streamEvents = [];
26+
private $readStreams = [];
27+
private $writeStreams = [];
2828
private $running;
2929
private $signals;
30-
private $signalEvents = array();
30+
private $signalEvents = [];
3131
private $streamListener;
3232

3333
public function __construct()
@@ -114,13 +114,11 @@ public function addTimer($interval, $callback)
114114
{
115115
$timer = new Timer($interval, $callback, false);
116116

117-
$that = $this;
118-
$timers = $this->timers;
119-
$callback = function () use ($timer, $timers, $that) {
117+
$callback = function () use ($timer) {
120118
\call_user_func($timer->getCallback(), $timer);
121119

122-
if ($timers->contains($timer)) {
123-
$that->cancelTimer($timer);
120+
if ($this->timers->contains($timer)) {
121+
$this->cancelTimer($timer);
124122
}
125123
};
126124

@@ -184,10 +182,9 @@ public function addSignal($signal, $listener)
184182
$this->signals->add($signal, $listener);
185183

186184
if (!isset($this->signalEvents[$signal])) {
187-
$signals = $this->signals;
188185
$this->signalEvents[$signal] = \uv_signal_init($this->uv);
189-
\uv_signal_start($this->signalEvents[$signal], function () use ($signals, $signal) {
190-
$signals->call($signal);
186+
\uv_signal_start($this->signalEvents[$signal], function () use ($signal) {
187+
$this->signals->call($signal);
191188
}, $signal);
192189
}
193190
}

‎src/Loop.php

+10-42
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,14 @@ public static function get()
4343
$hasRun = true;
4444
});
4545

46-
$stopped =& self::$stopped;
47-
register_shutdown_function(function () use ($loop, &$hasRun, &$stopped) {
46+
register_shutdown_function(function () use ($loop, &$hasRun) {
4847
// Don't run if we're coming from a fatal error (uncaught exception).
4948
$error = error_get_last();
50-
if ((isset($error['type']) ? $error['type'] : 0) & (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR)) {
49+
if (($error['type'] ?? 0) & (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR)) {
5150
return;
5251
}
5352

54-
if (!$hasRun && !$stopped) {
53+
if (!$hasRun && !self::$stopped) {
5554
$loop->run();
5655
}
5756
});
@@ -83,11 +82,7 @@ public static function set(LoopInterface $loop)
8382
*/
8483
public static function addReadStream($stream, $listener)
8584
{
86-
// create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
87-
if (self::$instance === null) {
88-
self::get();
89-
}
90-
self::$instance->addReadStream($stream, $listener);
85+
(self::$instance ?? self::get())->addReadStream($stream, $listener);
9186
}
9287

9388
/**
@@ -101,11 +96,7 @@ public static function addReadStream($stream, $listener)
10196
*/
10297
public static function addWriteStream($stream, $listener)
10398
{
104-
// create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
105-
if (self::$instance === null) {
106-
self::get();
107-
}
108-
self::$instance->addWriteStream($stream, $listener);
99+
(self::$instance ?? self::get())->addWriteStream($stream, $listener);
109100
}
110101

111102
/**
@@ -146,11 +137,7 @@ public static function removeWriteStream($stream)
146137
*/
147138
public static function addTimer($interval, $callback)
148139
{
149-
// create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
150-
if (self::$instance === null) {
151-
self::get();
152-
}
153-
return self::$instance->addTimer($interval, $callback);
140+
return (self::$instance ?? self::get())->addTimer($interval, $callback);
154141
}
155142

156143
/**
@@ -163,11 +150,7 @@ public static function addTimer($interval, $callback)
163150
*/
164151
public static function addPeriodicTimer($interval, $callback)
165152
{
166-
// create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
167-
if (self::$instance === null) {
168-
self::get();
169-
}
170-
return self::$instance->addPeriodicTimer($interval, $callback);
153+
return (self::$instance ?? self::get())->addPeriodicTimer($interval, $callback);
171154
}
172155

173156
/**
@@ -193,12 +176,7 @@ public static function cancelTimer(TimerInterface $timer)
193176
*/
194177
public static function futureTick($listener)
195178
{
196-
// create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
197-
if (self::$instance === null) {
198-
self::get();
199-
}
200-
201-
self::$instance->futureTick($listener);
179+
(self::$instance ?? self::get())->futureTick($listener);
202180
}
203181

204182
/**
@@ -211,12 +189,7 @@ public static function futureTick($listener)
211189
*/
212190
public static function addSignal($signal, $listener)
213191
{
214-
// create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
215-
if (self::$instance === null) {
216-
self::get();
217-
}
218-
219-
self::$instance->addSignal($signal, $listener);
192+
(self::$instance ?? self::get())->addSignal($signal, $listener);
220193
}
221194

222195
/**
@@ -242,12 +215,7 @@ public static function removeSignal($signal, $listener)
242215
*/
243216
public static function run()
244217
{
245-
// create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
246-
if (self::$instance === null) {
247-
self::get();
248-
}
249-
250-
self::$instance->run();
218+
(self::$instance ?? self::get())->run();
251219
}
252220

253221
/**

‎src/SignalsHandler.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
*/
88
final class SignalsHandler
99
{
10-
private $signals = array();
10+
private $signals = [];
1111

1212
public function add($signal, $listener)
1313
{
1414
if (!isset($this->signals[$signal])) {
15-
$this->signals[$signal] = array();
15+
$this->signals[$signal] = [];
1616
}
1717

1818
if (\in_array($listener, $this->signals[$signal])) {

‎src/StreamSelectLoop.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ final class StreamSelectLoop implements LoopInterface
5656

5757
private $futureTickQueue;
5858
private $timers;
59-
private $readStreams = array();
60-
private $readListeners = array();
61-
private $writeStreams = array();
62-
private $writeListeners = array();
59+
private $readStreams = [];
60+
private $readListeners = [];
61+
private $writeStreams = [];
62+
private $writeListeners = [];
6363
private $running;
6464
private $pcntl = false;
6565
private $pcntlPoll = false;
@@ -157,7 +157,7 @@ public function addSignal($signal, $listener)
157157
$this->signals->add($signal, $listener);
158158

159159
if ($first) {
160-
\pcntl_signal($signal, array($this->signals, 'call'));
160+
\pcntl_signal($signal, [$this->signals, 'call']);
161161
}
162162
}
163163

@@ -278,7 +278,7 @@ private function streamSelect(array &$read, array &$write, $timeout)
278278
// @link https://docs.microsoft.com/de-de/windows/win32/api/winsock2/nf-winsock2-select
279279
$except = null;
280280
if (\DIRECTORY_SEPARATOR === '\\') {
281-
$except = array();
281+
$except = [];
282282
foreach ($write as $key => $socket) {
283283
if (!isset($read[$key]) && @\ftell($socket) === 0) {
284284
$except[$key] = $socket;

0 commit comments

Comments
 (0)