Skip to content

Commit 3214f56

Browse files
committed
[Stream] Bug fix: multiple inheritence
Added PHP 5.3.3 to Travis as there was a BC break in PHP ~5.3.8 Took the close method out of Read/Write interfaces into its own Updated composer files to v0.1.1 tag
1 parent 37e3c36 commit 3214f56

4 files changed

Lines changed: 13 additions & 5 deletions

File tree

ReadableStreamInterface.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
use Evenement\EventEmitterInterface;
66

77
// Events: data, end, error, close
8-
interface ReadableStreamInterface extends EventEmitterInterface
8+
interface ReadableStreamInterface extends StreamInterface
99
{
1010
public function isReadable();
1111
public function pause();
1212
public function resume();
13-
public function close();
1413
public function pipe(WritableStreamInterface $dest, array $options = array());
1514
}

StreamInterface.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace React\Stream;
4+
5+
use Evenement\EventEmitterInterface;
6+
7+
interface StreamInterface extends EventEmitterInterface
8+
{
9+
public function close();
10+
}

WritableStreamInterface.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
use Evenement\EventEmitterInterface;
66

77
// Events: drain, error, close, pipe
8-
interface WritableStreamInterface extends EventEmitterInterface
8+
interface WritableStreamInterface extends StreamInterface
99
{
1010
public function isWritable();
1111
public function write($data);
1212
public function end($data = null);
13-
public function close();
1413
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"target-dir": "React/Stream",
1717
"extra": {
1818
"branch-alias": {
19-
"dev-master": "0.1.0"
19+
"dev-master": "0.1.1"
2020
}
2121
}
2222
}

0 commit comments

Comments
 (0)