[RFC] Improve compatibility with legacy versions

.travis.yml

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

composer.json

@@ -4,11 +4,11 @@
     "keywords": ["socket"],
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0",
-        "react/dns": "0.4.*",
-        "react/event-loop": "0.4.*",
-        "react/stream": "0.4.*",
-        "react/promise": "~2.0"
+        "php": ">=5.3.0",
+        "react/dns": "0.4.*|0.3.*",
+        "react/event-loop": "0.4.*|0.3.*",
+        "react/stream": "0.4.*|0.3.*",
+        "react/promise": "~2.0|~1.1"
     },
     "autoload": {
         "psr-4": {

src/SecureConnector.php

@@ -38,7 +38,8 @@ public function create($host, $port)
             );
         }
 
-        return $this->connector->create($host, $port)->then(function (Stream $stream) use ($context) {
+        $encryption = $this->streamEncryption;
+        return $this->connector->create($host, $port)->then(function (Stream $stream) use ($context, $encryption) {
             // (unencrypted) TCP/IP connection succeeded
 
             // set required SSL/TLS context options
@@ -47,7 +48,7 @@ public function create($host, $port)
             }
 
             // try to enable encryption
-            return $this->streamEncryption->enable($stream)->then(null, function ($error) use ($stream) {
+            return $encryption->enable($stream)->then(null, function ($error) use ($stream) {
                 // establishing encryption failed => close invalid connection and return error
                 $stream->close();
                 throw $error;

src/SecureStream.php

@@ -4,12 +4,11 @@
 
 use Evenement\EventEmitterTrait;
 use React\EventLoop\LoopInterface;
-use React\Stream\DuplexStreamInterface;
 use React\Stream\WritableStreamInterface;
 use React\Stream\Stream;
 use React\Stream\Util;
 
-class SecureStream extends Stream implements DuplexStreamInterface
+class SecureStream extends Stream
 {
 //    use EventEmitterTrait;
 
@@ -22,18 +21,19 @@ public function __construct(Stream $stream, LoopInterface $loop) {
         $this->stream = $stream->stream;
         $this->decorating = $stream;
         $this->loop = $loop;
+        $that = $this;
 
-        $stream->on('error', function($error) {
-            $this->emit('error', [$error, $this]);
+        $stream->on('error', function($error) use ($that) {
+            $that->emit('error', array($error, $that));
         });
-        $stream->on('end', function() {
-            $this->emit('end', [$this]);
+        $stream->on('end', function() use ($that) {
+            $that->emit('end', array($that));
         });
-        $stream->on('close', function() {
-            $this->emit('close', [$this]);
+        $stream->on('close', function() use ($that) {
+            $that->emit('close', array($that));
         });
-        $stream->on('drain', function() {
-            $this->emit('drain', [$this]);
+        $stream->on('drain', function() use ($that) {
+            $that->emit('drain', array($that));
         });
 
         $stream->pause();
@@ -45,7 +45,7 @@ public function handleData($stream)
     {
         $data = stream_get_contents($stream);
 
-        $this->emit('data', [$data, $this]);
+        $this->emit('data', array($data, $this));
 
         if (!is_resource($stream) || feof($stream)) {
             $this->end();
@@ -60,7 +60,7 @@ public function pause()
     public function resume()
     {
         if ($this->isReadable()) {
-            $this->loop->addReadStream($this->decorating->stream, [$this, 'handleData']);
+            $this->loop->addReadStream($this->decorating->stream, array($this, 'handleData'));
         }
     }
 

src/StreamEncryption.php

@@ -71,16 +71,20 @@ public function toggle(Stream $stream, $toggle)
         // get actual stream socket from stream instance
         $socket = $stream->stream;
 
-        $toggleCrypto = function () use ($socket, $deferred, $toggle) {
-            $this->toggleCrypto($socket, $deferred, $toggle);
+        $that = $this;
+        $toggleCrypto = function () use ($socket, $deferred, $toggle, $that) {
+            $that->toggleCrypto($socket, $deferred, $toggle);
         };
 
         $this->loop->addReadStream($socket, $toggleCrypto);
         $toggleCrypto();
 
-        return $deferred->promise()->then(function () use ($stream, $toggle) {
-            if ($toggle && $this->wrapSecure) {
-                return new SecureStream($stream, $this->loop);
+        $wrap = $this->wrapSecure && $toggle;
+        $loop = $this->loop;
+
+        return $deferred->promise()->then(function () use ($stream, $wrap, $loop) {
+            if ($wrap) {
+                return new SecureStream($stream, $loop);
             }
 
             $stream->resume();