Merge remote-tracking branch 'origin/legacy-fix'

* origin/legacy-fix:
  Changelog new line
  Changelog version
  Added changelog
  [Stream]
  [Stream] Bug fix: multiple inheritence

.travis.yml

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

CHANGELOG.md

@@ -0,0 +1,10 @@
+CHANGELOG
+=========
+
+* 0.1.1 (2012-06-12)
+
+ * Bug fix: Testing and functional against PHP >= 5.3.3 and <= 5.3.8
+
+* 0.1.0 (2012-06-11)
+
+ * First tagged release

composer.json

@@ -9,7 +9,7 @@
         "irc": "irc://irc.freenode.org/reactphp"
     },
     "require": {
-        "php": ">=5.3.2",
+        "php": ">=5.3.3",
         "evenement/evenement": "1.0.*",
         "guzzle/guzzle": "2.5.*",
         "silex/silex": "1.0.*"
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.0"
+            "dev-master": "0.1.1"
         }
     }
 }

src/React/Espresso/composer.json

@@ -14,7 +14,7 @@
     "target-dir": "React/Espresso",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.0"
+            "dev-master": "0.1.1"
         }
     }
 }

src/React/EventLoop/composer.json

@@ -15,7 +15,7 @@
     "target-dir": "React/EventLoop",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.0"
+            "dev-master": "0.1.1"
         }
     }
 }

src/React/Http/composer.json

@@ -14,7 +14,7 @@
     "target-dir": "React/Http",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.0"
+            "dev-master": "0.1.1"
         }
     }
 }

src/React/Socket/composer.json

@@ -15,7 +15,7 @@
     "target-dir": "React/Socket",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.0"
+            "dev-master": "0.1.1"
         }
     }
 }

src/React/Stream/ReadableStreamInterface.php

@@ -5,11 +5,10 @@
 use Evenement\EventEmitterInterface;
 
 // Events: data, end, error, close
-interface ReadableStreamInterface extends EventEmitterInterface
+interface ReadableStreamInterface extends StreamInterface
 {
     public function isReadable();
     public function pause();
     public function resume();
-    public function close();
     public function pipe(WritableStreamInterface $dest, array $options = array());
 }

src/React/Stream/StreamInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace React\Stream;
+
+use Evenement\EventEmitterInterface;
+
+// This class exists because ReadableStreamInterface and WritableStreamInterface
+//  both need close methods.
+// In PHP <= 5.3.8 a class can not implement 2 interfaces with coincidental matching methods
+interface StreamInterface extends EventEmitterInterface
+{
+    public function close();
+}

src/React/Stream/WritableStreamInterface.php

@@ -5,10 +5,9 @@
 use Evenement\EventEmitterInterface;
 
 // Events: drain, error, close, pipe
-interface WritableStreamInterface extends EventEmitterInterface
+interface WritableStreamInterface extends StreamInterface
 {
     public function isWritable();
     public function write($data);
     public function end($data = null);
-    public function close();
 }

src/React/Stream/composer.json

@@ -16,7 +16,7 @@
     "target-dir": "React/Stream",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.0"
+            "dev-master": "0.1.1"
         }
     }
 }