Update PHP language syntax and remove legacy workarounds

WyriHaximus-labs · Feb 24, 2024 · 7fa1b76 · 7fa1b76
1 parent ec578d4
commit 7fa1b76
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 84 deletions.
diff --git a/src/ExtEvLoop.php b/src/ExtEvLoop.php
@@ -41,12 +41,12 @@ class ExtEvLoop implements LoopInterface
     /**
      * @var EvIo[]
      */
-    private $readStreams = array();
+    private $readStreams = [];
 
     /**
      * @var EvIo[]
      */
-    private $writeStreams = array();
+    private $writeStreams = [];
 
     /**
      * @var bool
@@ -61,7 +61,7 @@ class ExtEvLoop implements LoopInterface
     /**
      * @var \EvSignal[]
      */
-    private $signalEvents = array();
+    private $signalEvents = [];
 
     public function __construct()
     {
@@ -138,13 +138,12 @@ public function addTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, false);
 
-        $that = $this;
         $timers = $this->timers;
-        $callback = function () use ($timer, $timers, $that) {
+        $callback = function () use ($timer, $timers) {
             \call_user_func($timer->getCallback(), $timer);
 
             if ($timers->contains($timer)) {
-                $that->cancelTimer($timer);
+                $this->cancelTimer($timer);
             }
         };
 

diff --git a/src/ExtEventLoop.php b/src/ExtEventLoop.php
@@ -27,15 +27,15 @@ final class ExtEventLoop implements LoopInterface
     private $timerCallback;
     private $timerEvents;
     private $streamCallback;
-    private $readEvents = array();
-    private $writeEvents = array();
-    private $readListeners = array();
-    private $writeListeners = array();
-    private $readRefs = array();
-    private $writeRefs = array();
+    private $readEvents = [];
+    private $writeEvents = [];
+    private $readListeners = [];
+    private $writeListeners = [];
+    private $readRefs = [];
+    private $writeRefs = [];
     private $running;
     private $signals;
-    private $signalEvents = array();
+    private $signalEvents = [];
 
     public function __construct()
     {
@@ -67,8 +67,8 @@ public function __destruct()
             $this->timerEvents->detach($timer);
         }
 
-        $this->readEvents = array();
-        $this->writeEvents = array();
+        $this->readEvents = [];
+        $this->writeEvents = [];
     }
 
     public function addReadStream($stream, $listener)
@@ -85,9 +85,7 @@ public function addReadStream($stream, $listener)
 
         // ext-event does not increase refcount on stream resources for PHP 7+
         // manually keep track of stream resource to prevent premature garbage collection
-        if (\PHP_VERSION_ID >= 70000) {
-            $this->readRefs[$key] = $stream;
-        }
+        $this->readRefs[$key] = $stream;
     }
 
     public function addWriteStream($stream, $listener)
@@ -104,9 +102,7 @@ public function addWriteStream($stream, $listener)
 
         // ext-event does not increase refcount on stream resources for PHP 7+
         // manually keep track of stream resource to prevent premature garbage collection
-        if (\PHP_VERSION_ID >= 70000) {
-            $this->writeRefs[$key] = $stream;
-        }
+        $this->writeRefs[$key] = $stream;
     }
 
     public function removeReadStream($stream)
@@ -173,7 +169,7 @@ public function addSignal($signal, $listener)
         $this->signals->add($signal, $listener);
 
         if (!isset($this->signalEvents[$signal])) {
-            $this->signalEvents[$signal] = Event::signal($this->eventBase, $signal, array($this->signals, 'call'));
+            $this->signalEvents[$signal] = Event::signal($this->eventBase, $signal, [$this->signals, 'call']);
             $this->signalEvents[$signal]->add();
         }
     }

diff --git a/src/ExtUvLoop.php b/src/ExtUvLoop.php
@@ -22,12 +22,12 @@ final class ExtUvLoop implements LoopInterface
     private $uv;
     private $futureTickQueue;
     private $timers;
-    private $streamEvents = array();
-    private $readStreams = array();
-    private $writeStreams = array();
+    private $streamEvents = [];
+    private $readStreams = [];
+    private $writeStreams = [];
     private $running;
     private $signals;
-    private $signalEvents = array();
+    private $signalEvents = [];
     private $streamListener;
 
     public function __construct()
@@ -114,13 +114,12 @@ public function addTimer($interval, $callback)
     {
         $timer = new Timer($interval, $callback, false);
 
-        $that = $this;
         $timers = $this->timers;
-        $callback = function () use ($timer, $timers, $that) {
+        $callback = function () use ($timer, $timers) {
             \call_user_func($timer->getCallback(), $timer);
 
             if ($timers->contains($timer)) {
-                $that->cancelTimer($timer);
+                $this->cancelTimer($timer);
             }
         };
 

diff --git a/src/Loop.php b/src/Loop.php
@@ -83,11 +83,7 @@ public static function set(LoopInterface $loop)
      */
     public static function addReadStream($stream, $listener)
     {
-        // create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
-        if (self::$instance === null) {
-            self::get();
-        }
-        self::$instance->addReadStream($stream, $listener);
+        (self::$instance ?? self::get())->addReadStream($stream, $listener);
     }
 
     /**
@@ -101,11 +97,7 @@ public static function addReadStream($stream, $listener)
      */
     public static function addWriteStream($stream, $listener)
     {
-        // create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
-        if (self::$instance === null) {
-            self::get();
-        }
-        self::$instance->addWriteStream($stream, $listener);
+        (self::$instance ?? self::get())->addWriteStream($stream, $listener);
     }
 
     /**
@@ -146,11 +138,7 @@ public static function removeWriteStream($stream)
      */
     public static function addTimer($interval, $callback)
     {
-        // create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
-        if (self::$instance === null) {
-            self::get();
-        }
-        return self::$instance->addTimer($interval, $callback);
+        return (self::$instance ?? self::get())->addTimer($interval, $callback);
     }
 
     /**
@@ -163,11 +151,7 @@ public static function addTimer($interval, $callback)
      */
     public static function addPeriodicTimer($interval, $callback)
     {
-        // create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
-        if (self::$instance === null) {
-            self::get();
-        }
-        return self::$instance->addPeriodicTimer($interval, $callback);
+        return (self::$instance ?? self::get())->addPeriodicTimer($interval, $callback);
     }
 
     /**
@@ -193,12 +177,7 @@ public static function cancelTimer(TimerInterface $timer)
      */
     public static function futureTick($listener)
     {
-        // create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
-        if (self::$instance === null) {
-            self::get();
-        }
-
-        self::$instance->futureTick($listener);
+        (self::$instance ?? self::get())->futureTick($listener);
     }
 
     /**
@@ -211,12 +190,7 @@ public static function futureTick($listener)
      */
     public static function addSignal($signal, $listener)
     {
-        // create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
-        if (self::$instance === null) {
-            self::get();
-        }
-
-        self::$instance->addSignal($signal, $listener);
+        (self::$instance ?? self::get())->addSignal($signal, $listener);
     }
 
     /**
@@ -242,12 +216,7 @@ public static function removeSignal($signal, $listener)
      */
     public static function run()
     {
-        // create loop instance on demand (legacy PHP < 7 doesn't like ternaries in method calls)
-        if (self::$instance === null) {
-            self::get();
-        }
-
-        self::$instance->run();
+        (self::$instance ?? self::get())->run();
     }
 
     /**

diff --git a/src/SignalsHandler.php b/src/SignalsHandler.php
@@ -7,12 +7,12 @@
  */
 final class SignalsHandler
 {
-    private $signals = array();
+    private $signals = [];
 
     public function add($signal, $listener)
     {
         if (!isset($this->signals[$signal])) {
-            $this->signals[$signal] = array();
+            $this->signals[$signal] = [];
         }
 
         if (\in_array($listener, $this->signals[$signal])) {

diff --git a/src/StreamSelectLoop.php b/src/StreamSelectLoop.php
@@ -56,10 +56,10 @@ final class StreamSelectLoop implements LoopInterface
 
     private $futureTickQueue;
     private $timers;
-    private $readStreams = array();
-    private $readListeners = array();
-    private $writeStreams = array();
-    private $writeListeners = array();
+    private $readStreams = [];
+    private $readListeners = [];
+    private $writeStreams = [];
+    private $writeListeners = [];
     private $running;
     private $pcntl = false;
     private $pcntlPoll = false;
@@ -157,7 +157,7 @@ public function addSignal($signal, $listener)
         $this->signals->add($signal, $listener);
 
         if ($first) {
-            \pcntl_signal($signal, array($this->signals, 'call'));
+            \pcntl_signal($signal, [$this->signals, 'call']);
         }
     }
 
@@ -278,7 +278,7 @@ private function streamSelect(array &$read, array &$write, $timeout)
             // @link https://docs.microsoft.com/de-de/windows/win32/api/winsock2/nf-winsock2-select
             $except = null;
             if (\DIRECTORY_SEPARATOR === '\\') {
-                $except = array();
+                $except = [];
                 foreach ($write as $key => $socket) {
                     if (!isset($read[$key]) && @\ftell($socket) === 0) {
                         $except[$key] = $socket;
@@ -305,9 +305,6 @@ private function streamSelect(array &$read, array &$write, $timeout)
             } catch (\Throwable $e) { // @codeCoverageIgnoreStart
                 \restore_error_handler();
                 throw $e;
-            } catch (\Exception $e) {
-                \restore_error_handler();
-                throw $e;
             } // @codeCoverageIgnoreEnd
 
             if ($except) {

diff --git a/src/Timer/Timers.php b/src/Timer/Timers.php
@@ -15,8 +15,8 @@
 final class Timers
 {
     private $time;
-    private $timers = array();
-    private $schedule = array();
+    private $timers = [];
+    private $schedule = [];
     private $sorted = true;
     private $useHighResolution;
 

diff --git a/tests/LoopTest.php b/tests/LoopTest.php
@@ -21,7 +21,7 @@ public function testCallingLoopGetShouldAlwaysReturnTheSameEventLoop()
      */
     public function numberOfTests()
     {
-        return array(array(), array(), array());
+        return [[], [], []];
     }
 
     public function testStaticAddReadStreamCallsAddReadStreamOnLoopInstance()

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -41,10 +41,10 @@ protected function createCallableMock()
     {
         if (method_exists('PHPUnit\Framework\MockObject\MockBuilder', 'addMethods')) {
             // PHPUnit 9+
-            return $this->getMockBuilder('stdClass')->addMethods(array('__invoke'))->getMock();
+            return $this->getMockBuilder('stdClass')->addMethods(['__invoke'])->getMock();
         } else {
-            // legacy PHPUnit 4 - PHPUnit 9
-            return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+            // legacy PHPUnit
+            return $this->getMockBuilder('stdClass')->setMethods(['__invoke'])->getMock();
         }
     }