Merge pull request #29 from clue-labs/compat

[RFC] Improve compatibility with legacy versions

Author: cboden

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 5.3
   - 5.4
   - 5.5
   - 5.6

composer.json

@@ -4,12 +4,12 @@
     "keywords": ["stream", "pipe"],
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0",
-        "evenement/evenement": "^2.0"
+        "php": ">=5.3.8",
+        "evenement/evenement": "^2.0|^1.0"
     },
     "require-dev": {
-        "react/event-loop": "^0.4",
-        "react/promise": "^2.0"
+        "react/event-loop": "^0.4|^0.3",
+        "react/promise": "^2.0|^1.0"
     },
     "suggest": {
         "react/event-loop": "^0.4",

src/Buffer.php

@@ -72,7 +72,7 @@ public function close()
         $this->listening = false;
         $this->data = '';
 
-        $this->emit('close', [$this]);
+        $this->emit('close', array($this));
     }
 
     public function handleWrite()
@@ -112,7 +112,7 @@ public function handleWrite()
 
         $len = strlen($this->data);
         if ($len >= $this->softLimit && $len - $sent < $this->softLimit) {
-            $this->emit('drain', [$this]);
+            $this->emit('drain', array($this));
         }
 
         $this->data = (string) substr($this->data, $sent);
@@ -121,7 +121,7 @@ public function handleWrite()
             $this->loop->removeWriteStream($this->stream);
             $this->listening = false;
 
-            $this->emit('full-drain', [$this]);
+            $this->emit('full-drain', array($this));
         }
     }
 

src/Stream.php

@@ -38,13 +38,15 @@ public function __construct($stream, LoopInterface $loop)
         $this->loop = $loop;
         $this->buffer = new Buffer($this->stream, $this->loop);
 
-        $this->buffer->on('error', function ($error) {
-            $this->emit('error', array($error, $this));
-            $this->close();
+        $that = $this;
+
+        $this->buffer->on('error', function ($error) use ($that) {
+            $that->emit('error', array($error, $that));
+            $that->close();
         });
 
-        $this->buffer->on('drain', function () {
-            $this->emit('drain', array($this));
+        $this->buffer->on('drain', function () use ($that) {
+            $that->emit('drain', array($that));
         });
 
         $this->resume();
@@ -112,9 +114,7 @@ public function end($data = null)
         $this->readable = false;
         $this->writable = false;
 
-        $this->buffer->on('close', function () {
-            $this->close();
-        });
+        $this->buffer->on('close', array($this, 'close'));
 
         $this->buffer->end($data);
     }

tests/StreamIntegrationTest.php

@@ -9,12 +9,12 @@ class StreamIntegrationTest extends TestCase
 {
     public function loopProvider()
     {
-        return [
-            [function() { return true; }, function() { return new rel\StreamSelectLoop; }],
-            [function() { return function_exists('event_base_new'); }, function() { return new rel\LibEventLoop; }],
-            [function() { return class_exists('libev\EventLoop'); }, function() { return new rel\LibEvLoop; }],
-            [function() { return class_exists('EventBase'); }, function() { return new rel\ExtEventLoop; }]
-        ];
+        return array(
+            array(function() { return true; }, function() { return new rel\StreamSelectLoop; }),
+            array(function() { return function_exists('event_base_new'); }, function() { return new rel\LibEventLoop; }),
+            array(function() { return class_exists('libev\EventLoop'); }, function() { return new rel\LibEvLoop; }),
+            array(function() { return class_exists('EventBase'); }, function() { return new rel\ExtEventLoop; })
+        );
     }
 
     /**