[RFC] Improve compatibility with legacy versions

clue · clue · commit c7a58c0e82f0 · 2018-02-06T21:31:23.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 
 php:
+# - 5.3 # requires old distro, see below
   - 5.4
   - 5.5
   - 5.6
@@ -13,6 +14,9 @@ php:
 dist: trusty
 
 matrix:
+  include:
+    - php: 5.3
+      dist: precise
   allow_failures:
     - php: hhvm
 
diff --git a/README.md b/README.md
@@ -158,7 +158,7 @@ A `stream_select()` based event loop.
 This uses the [`stream_select()`](http://php.net/manual/en/function.stream-select.php)
 function and is the only implementation which works out of the box with PHP.
 
-This event loop works out of the box on PHP 5.4 through PHP 7+ and HHVM.
+This event loop works out of the box on PHP 5.3 through PHP 7+ and HHVM.
 This means that no installation is required and this library works on all
 platforms and supported PHP versions.
 Accordingly, the [`Factory`](#factory) will use this event loop by default if
@@ -199,7 +199,7 @@ An `ext-event` based event loop.
 This uses the [`event` PECL extension](https://pecl.php.net/package/event).
 It supports the same backends as libevent.
 
-This loop is known to work with PHP 5.4 through PHP 7+.
+This loop is known to work with PHP 5.3 through PHP 7+.
 
 #### ExtLibeventLoop
 
@@ -574,7 +574,7 @@ $ composer require react/event-loop
 ```
 
 This project aims to run on any platform and thus does not require any PHP
-extensions and supports running on legacy PHP 5.4 through current PHP 7+ and
+extensions and supports running on legacy PHP 5.3 through current PHP 7+ and
 HHVM.
 It's *highly recommended to use PHP 7+* for this project.
 
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "keywords": ["event-loop", "asynchronous"],
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8.35 || ^5.7 || ^6.4"
diff --git a/src/ExtEventLoop.php b/src/ExtEventLoop.php
@@ -15,7 +15,7 @@
  * This uses the [`event` PECL extension](https://pecl.php.net/package/event).
  * It supports the same backends as libevent.
  *
- * This loop is known to work with PHP 5.4 through PHP 7+.
+ * This loop is known to work with PHP 5.3 through PHP 7+.
  *
  * @link https://pecl.php.net/package/event
  */
@@ -26,15 +26,15 @@ final class ExtEventLoop implements LoopInterface
     private $timerCallback;
     private $timerEvents;
     private $streamCallback;
-    private $readEvents = [];
-    private $writeEvents = [];
-    private $readListeners = [];
-    private $writeListeners = [];
-    private $readRefs = [];
-    private $writeRefs = [];
+    private $readEvents = array();
+    private $writeEvents = array();
+    private $readListeners = array();
+    private $writeListeners = array();
+    private $readRefs = array();
+    private $writeRefs = array();
     private $running;
     private $signals;
-    private $signalEvents = [];
+    private $signalEvents = array();
 
     public function __construct(EventBaseConfig $config = null)
     {
@@ -215,10 +215,11 @@ private function scheduleTimer(TimerInterface $timer)
      */
     private function createTimerCallback()
     {
-        $this->timerCallback = function ($_, $__, $timer) {
+        $timers = $this->timerEvents;
+        $this->timerCallback = function ($_, $__, $timer) use ($timers) {
             call_user_func($timer->getCallback(), $timer);
 
-            if (!$timer->isPeriodic() && $this->timerEvents->contains($timer)) {
+            if (!$timer->isPeriodic() && $timers->contains($timer)) {
                 $this->cancelTimer($timer);
             }
         };
@@ -233,15 +234,17 @@ private function createTimerCallback()
      */
     private function createStreamCallback()
     {
-        $this->streamCallback = function ($stream, $flags) {
+        $read =& $this->readListeners;
+        $write =& $this->writeListeners;
+        $this->streamCallback = function ($stream, $flags) use (&$read, &$write) {
             $key = (int) $stream;
 
-            if (Event::READ === (Event::READ & $flags) && isset($this->readListeners[$key])) {
-                call_user_func($this->readListeners[$key], $stream);
+            if (Event::READ === (Event::READ & $flags) && isset($read[$key])) {
+                call_user_func($read[$key], $stream);
             }
 
-            if (Event::WRITE === (Event::WRITE & $flags) && isset($this->writeListeners[$key])) {
-                call_user_func($this->writeListeners[$key], $stream);
+            if (Event::WRITE === (Event::WRITE & $flags) && isset($write[$key])) {
+                call_user_func($write[$key], $stream);
             }
         };
     }
diff --git a/src/ExtLibevLoop.php b/src/ExtLibevLoop.php
@@ -28,11 +28,11 @@ final class ExtLibevLoop implements LoopInterface
     private $loop;
     private $futureTickQueue;
     private $timerEvents;
-    private $readEvents = [];
-    private $writeEvents = [];
+    private $readEvents = array();
+    private $writeEvents = array();
     private $running;
     private $signals;
-    private $signalEvents = [];
+    private $signalEvents = array();
 
     public function __construct()
     {
@@ -100,10 +100,11 @@ public function addTimer($interval, $callback)
     {
         $timer = new Timer( $interval, $callback, false);
 
-        $callback = function () use ($timer) {
+        $timers = $this->timerEvents;
+        $callback = function () use ($timer, $timers) {
             call_user_func($timer->getCallback(), $timer);
 
-            if ($this->timerEvents->contains($timer)) {
+            if ($timers->contains($timer)) {
                 $this->cancelTimer($timer);
             }
         };
@@ -148,8 +149,9 @@ public function addSignal($signal, $listener)
         $this->signals->add($signal, $listener);
 
         if (!isset($this->signalEvents[$signal])) {
-            $this->signalEvents[$signal] = new SignalEvent(function () use ($signal) {
-                $this->signals->call($signal);
+            $signals = $this->signals;
+            $this->signalEvents[$signal] = new SignalEvent(function () use ($signals, $signal) {
+                $signals->call($signal);
             }, $signal);
             $this->loop->add($this->signalEvents[$signal]);
         }
diff --git a/src/ExtLibeventLoop.php b/src/ExtLibeventLoop.php
@@ -42,13 +42,13 @@ final class ExtLibeventLoop implements LoopInterface
     private $timerCallback;
     private $timerEvents;
     private $streamCallback;
-    private $readEvents = [];
-    private $writeEvents = [];
-    private $readListeners = [];
-    private $writeListeners = [];
+    private $readEvents = array();
+    private $writeEvents = array();
+    private $readListeners = array();
+    private $writeListeners = array();
     private $running;
     private $signals;
-    private $signalEvents = [];
+    private $signalEvents = array();
 
     public function __construct()
     {
@@ -228,18 +228,19 @@ private function scheduleTimer(TimerInterface $timer)
      */
     private function createTimerCallback()
     {
-        $this->timerCallback = function ($_, $__, $timer) {
+        $timers = $this->timerEvents;
+        $this->timerCallback = function ($_, $__, $timer) use ($timers) {
             call_user_func($timer->getCallback(), $timer);
 
             // Timer already cancelled ...
-            if (!$this->timerEvents->contains($timer)) {
+            if (!$timers->contains($timer)) {
                 return;
             }
 
             // Reschedule periodic timers ...
             if ($timer->isPeriodic()) {
                 event_add(
-                    $this->timerEvents[$timer],
+                    $timers[$timer],
                     $timer->getInterval() * self::MICROSECONDS_PER_SECOND
                 );
 
@@ -259,15 +260,17 @@ private function createTimerCallback()
      */
     private function createStreamCallback()
     {
-        $this->streamCallback = function ($stream, $flags) {
+        $read =& $this->readListeners;
+        $write =& $this->writeListeners;
+        $this->streamCallback = function ($stream, $flags) use (&$read, &$write) {
             $key = (int) $stream;
 
-            if (EV_READ === (EV_READ & $flags) && isset($this->readListeners[$key])) {
-                call_user_func($this->readListeners[$key], $stream);
+            if (EV_READ === (EV_READ & $flags) && isset($read[$key])) {
+                call_user_func($read[$key], $stream);
             }
 
-            if (EV_WRITE === (EV_WRITE & $flags) && isset($this->writeListeners[$key])) {
-                call_user_func($this->writeListeners[$key], $stream);
+            if (EV_WRITE === (EV_WRITE & $flags) && isset($write[$key])) {
+                call_user_func($write[$key], $stream);
             }
         };
     }
diff --git a/src/SignalsHandler.php b/src/SignalsHandler.php
@@ -7,12 +7,12 @@
  */
 final class SignalsHandler
 {
-    private $signals = [];
+    private $signals = array();
 
     public function add($signal, $listener)
     {
         if (!isset($this->signals[$signal])) {
-            $this->signals[$signal] = [];
+            $this->signals[$signal] = array();
         }
 
         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 = [];
-    private $readListeners = [];
-    private $writeStreams = [];
-    private $writeListeners = [];
+    private $readStreams = array();
+    private $readListeners = array();
+    private $writeStreams = array();
+    private $writeListeners = array();
     private $running;
     private $pcntl = false;
     private $signals;
diff --git a/tests/AbstractLoopTest.php b/tests/AbstractLoopTest.php
diff --git a/tests/StreamSelectLoopTest.php b/tests/StreamSelectLoopTest.php
diff --git a/travis-init.sh b/travis-init.sh

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@`
`7`	`7`	`*/`
`8`	`8`	`final class SignalsHandler`
`9`	`9`	`{`
`10`		`- private $signals = [];`
	`10`	`+ private $signals = array();`
`11`	`11`
`12`	`12`	`public function add($signal, $listener)`
`13`	`13`	`{`
`14`	`14`	`if (!isset($this->signals[$signal])) {`
`15`		`- $this->signals[$signal] = [];`
	`15`	`+ $this->signals[$signal] = array();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`if (in_array($listener, $this->signals[$signal])) {`