Skip to content

Changed $stream from DuplexStreamInterface to ReadableStreamInterface in Response constructor #63

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 4 commits into from
Oct 6, 2016
Merged

Changed $stream from DuplexStreamInterface to ReadableStreamInterface in Response constructor #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e38380f
Changed from DuplexStreamInterface to ReadableStreamInterface as per …
WyriHaximus Sep 23, 2016
c7cb6d5
Over eagerly removed test
WyriHaximus Sep 23, 2016
9be294b
Properly close the underlying stream
WyriHaximus Sep 24, 2016
69a61af
Run test method
WyriHaximus Sep 24, 2016
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
5 changes: 2 additions & 3 deletions src/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace React\HttpClient;

use Evenement\EventEmitterTrait;
use React\Stream\DuplexStreamInterface;
use React\Stream\ReadableStreamInterface;
use React\Stream\Util;
use React\Stream\WritableStreamInterface;
Expand All @@ -25,7 +24,7 @@ class Response implements ReadableStreamInterface
private $headers;
private $readable = true;

public function __construct(DuplexStreamInterface $stream, $protocol, $version, $code, $reasonPhrase, $headers)
public function __construct(ReadableStreamInterface $stream, $protocol, $version, $code, $reasonPhrase, $headers)
Copy link
Member

@clue clue Oct 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

For the reference only: This change preserves BC because you can still pass in a DuplexStreamInterface because it also implements the ReadableStreamInterface.

{
$this->stream = $stream;
$this->protocol = $protocol;
Expand Down Expand Up @@ -108,7 +107,7 @@ public function close(\Exception $error = null)
$this->emit('end', array($error, $this));

$this->removeAllListeners();
$this->stream->end();
$this->stream->close();
}
Copy link
Member

@clue clue Sep 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the underlying stream be close()d here?

Copy link
Member Author

@WyriHaximus WyriHaximus Sep 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it should 👍


public function isReadable()
Expand Down
2 changes: 1 addition & 1 deletion tests/ResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function responseShouldEmitEndEventOnEnd()

$this->stream
->expects($this->at(0))
->method('end');
->method('close');

$response->handleData('some data');
$response->handleEnd();
Expand Down