Skip to content

Forward compatebility with ReactPHP packages #51

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

Closed
wants to merge 6 commits into from
Closed

Forward compatebility with ReactPHP packages #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eca3e3b
Forward compatebility with ReactPHP packages
WyriHaximus Oct 26, 2017
3f95417
Merge branch 'master' into async-STDOUT
WyriHaximus Oct 28, 2017
15a8564
Merge branch 'master' into async-STDOUT
WyriHaximus Oct 28, 2017
563f30c
Removed Stdin and Stdout in favour of using streams directly in Stdio
WyriHaximus Oct 28, 2017
923b5f1
Ensure close is called
WyriHaximus Oct 28, 2017
ead9089
Merge branch 'master' of https://github.com/clue/php-stdio-react into…
WyriHaximus Nov 3, 2017
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
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
],
"require": {
"php": ">=5.3",
"react/event-loop": "0.3.*|0.4.*",
"react/stream": "^0.4.2",
"clue/utf8-react": "^1.0 || ^0.1",
"clue/term-react": "^1.0 || ^0.1.1"
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
"react/stream": "^1.0 || ^0.7.2",
"clue/utf8-react": "^1.1",
"clue/term-react": "^1.1"
},
"suggest": {
"ext-mbstring": "Using ext-mbstring should provide slightly better performance for handling I/O"
Expand Down
97 changes: 0 additions & 97 deletions src/Stdin.php
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions src/Stdio.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
use Evenement\EventEmitter;
use React\Stream\DuplexStreamInterface;
use React\EventLoop\LoopInterface;
use React\Stream\ReadableResourceStream;
use React\Stream\ReadableStreamInterface;
use React\Stream\WritableResourceStream;
use React\Stream\WritableStreamInterface;
use React\Stream\Util;

Expand All @@ -22,11 +24,11 @@ class Stdio extends EventEmitter implements DuplexStreamInterface
public function __construct(LoopInterface $loop, ReadableStreamInterface $input = null, WritableStreamInterface $output = null, Readline $readline = null)
{
if ($input === null) {
$input = new Stdin($loop);
$input = new ReadableResourceStream(STDIN, $loop);
}

if ($output === null) {
$output = new Stdout();
$output = new WritableResourceStream(STDOUT, $loop);
}

if ($readline === null) {
Expand Down
31 changes: 0 additions & 31 deletions src/Stdout.php
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion tests/ReadlineTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use Clue\React\Stdio\Readline;
use React\Stream\ReadableStream;
use React\Stream\ThroughStream;

class ReadlineTest extends TestCase
{
Expand All @@ -11,7 +12,7 @@ class ReadlineTest extends TestCase

public function setUp()
{
$this->input = new ReadableStream();
$this->input = new ThroughStream();
$this->output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();

$this->readline = new Readline($this->input, $this->output);
Expand Down
20 changes: 17 additions & 3 deletions tests/StdioTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use Clue\React\Stdio\Stdio;
use Clue\React\Stdio\Readline;
use React\Stream\ReadableStream;
use React\Stream\ThroughStream;
use React\Stream\WritableStream;

class StdioTest extends TestCase
Expand All @@ -18,6 +19,19 @@ public function setUp()
public function testCtorDefaultArgs()
{
$stdio = new Stdio($this->loop);

$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
$input->expects($this->once())->method('close');
$inputProperty = new ReflectionProperty($stdio, 'input');
$inputProperty->setAccessible(true);
$inputProperty->setValue($stdio, $input);

$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
$output->expects($this->once())->method('close');
$outputProperty = new ReflectionProperty($stdio, 'output');
$outputProperty->setAccessible(true);
$outputProperty->setValue($stdio, $output);

$stdio->close();
}

Expand Down Expand Up @@ -461,7 +475,7 @@ public function testDataEventWillBeForwarded()

public function testEndEventWillBeForwarded()
{
$input = new ReadableStream();
$input = new ThroughStream();
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();

//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
Expand All @@ -476,7 +490,7 @@ public function testEndEventWillBeForwarded()

public function testErrorEventFromInputWillBeForwarded()
{
$input = new ReadableStream();
$input = new ThroughStream();
$output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();

//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
Expand All @@ -492,7 +506,7 @@ public function testErrorEventFromInputWillBeForwarded()
public function testErrorEventFromOutputWillBeForwarded()
{
$input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
$output = new WritableStream();
$output = new ThroughStream();

//$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
$readline = new Readline($input, $output);
Expand Down