Skip to content

CompositeStream forwards pause to pipe source on first write attempt #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyriHaximus merged 1 commit into from
May 2, 2017
Merged

CompositeStream forwards pause to pipe source on first write attempt #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/CompositeStream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class CompositeStream extends EventEmitter implements DuplexStreamInterface
{
protected $readable;
protected $writable;
protected $pipeSource;
protected $closed = false;

public function __construct(ReadableStreamInterface $readable, WritableStreamInterface $writable)
Expand All @@ -21,13 +20,6 @@ public function __construct(ReadableStreamInterface $readable, WritableStreamInt

$this->readable->on('close', array($this, 'close'));
$this->writable->on('close', array($this, 'close'));

$this->on('pipe', array($this, 'handlePipeEvent'));
}

public function handlePipeEvent($source)
{
$this->pipeSource = $source;
}

public function isReadable()
Expand All @@ -37,10 +29,6 @@ public function isReadable()

public function pause()
{
if ($this->pipeSource) {
$this->pipeSource->pause();
}

$this->readable->pause();
}

Expand All @@ -50,10 +38,6 @@ public function resume()
return;
}

if ($this->pipeSource) {
$this->pipeSource->resume();
}

$this->readable->resume();
}

Expand Down Expand Up @@ -85,8 +69,6 @@ public function close()
}

$this->closed = true;
$this->pipeSource = null;

$this->readable->close();
$this->writable->close();

Expand Down
60 changes: 0 additions & 60 deletions tests/CompositeStreamTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,66 +146,6 @@ public function itShouldHandlePipingCorrectly()
$input->emit('data', array('foo'));
}

/** @test */
public function itShouldForwardPauseUpstreamWhenPipedTo()
{
$readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
$readable->expects($this->any())->method('isReadable')->willReturn(true);
$writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
$writable->expects($this->any())->method('isWritable')->willReturn(true);

$composite = new CompositeStream($readable, $writable);

$input = $this->getMockBuilder('React\Stream\ThroughStream')->setMethods(array('pause', 'resume'))->getMock();
$input
->expects($this->once())
->method('pause');

$input->pipe($composite);
$composite->pause();
}

/** @test */
public function itShouldForwardResumeUpstreamWhenPipedTo()
{
$readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
$readable->expects($this->any())->method('isReadable')->willReturn(true);
$writable = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
$writable->expects($this->any())->method('isWritable')->willReturn(true);

$composite = new CompositeStream($readable, $writable);

$input = $this->getMockBuilder('React\Stream\ThroughStream')->setMethods(array('pause', 'resume'))->getMock();
$input
->expects($this->once())
->method('resume');

$input->pipe($composite);
$composite->resume();
}

/** @test */
public function itShouldForwardPauseAndResumeUpstreamWhenPipedTo()
{
$readable = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
$writable = new ThroughStream();
$writable->pause();

$composite = new CompositeStream($readable, $writable);

$input = $this->getMockBuilder('React\Stream\ThroughStream')->setMethods(array('pause', 'resume'))->getMock();
$input
->expects($this->once())
->method('pause');
$input
->expects($this->once())
->method('resume');

$input->pipe($composite);
$input->emit('data', array('foo'));
$writable->emit('drain');
}

/** @test */
public function itShouldForwardPipeCallsToReadableStream()
{
Expand Down