Skip to content

Support react/stream 1.0 and 0.7 #23

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
WyriHaximus wants to merge 2 commits into from
Closed

Support react/stream 1.0 and 0.7 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef1d97
Support react/stream 1.0 and 0.7
WyriHaximus Jun 27, 2017
719c58f
Merge branch 'master' into support-stream-1.0-and-0.7
WyriHaximus Jul 6, 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
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
},
"require": {
"php": ">=5.3",
"react/stream": "^0.7 || ^0.6 || ^0.5 || ^0.4 || ^0.3"
"react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4 || ^0.3"
},
"require-dev": {
"phpunit/phpunit": "^5.0 || ^4.8",
"react/event-loop": "^0.4 || ^0.3",
"react/stream": "^0.6"
"react/stream": "^1.0 || ^0.7"
}
}
8 changes: 4 additions & 4 deletions tests/ControlCodeParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use React\Stream\ReadableStream;
use Clue\React\Term\ControlCodeParser;
use React\Stream\ThroughStream;

class ControlCodeParserTest extends TestCase
{
Expand All @@ -10,7 +10,7 @@ class ControlCodeParserTest extends TestCase

public function setUp()
{
$this->input = new ReadableStream();
$this->input = new ThroughStream();
$this->parser = new ControlCodeParser($this->input);
}

Expand Down Expand Up @@ -264,7 +264,7 @@ public function testClosingParserWillCloseInput()

public function testClosingParserWillRemoveAllDataListeners()
{
$this->input = new ReadableStream();
$this->input = new ThroughStream();
$this->parser = new ControlCodeParser($this->input);

$this->parser->on('data', $this->expectCallableNever());
Expand Down Expand Up @@ -300,7 +300,7 @@ public function testPassingClosedInputToParserWillCloseParser()

public function testPassingClosedInputToParserWillNotAddAnyDataListeners()
{
$this->input = new ReadableStream();
$this->input = new ThroughStream();
$this->input->close();

$this->parser = new ControlCodeParser($this->input);
Expand Down
6 changes: 3 additions & 3 deletions tests/FunctionalControlCodeParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php

use React\EventLoop\Factory;
use React\Stream\Stream;
use Clue\React\Term\ControlCodeParser;
use React\EventLoop\Factory;
use React\Stream\ReadableResourceStream;

class FunctionalControlCodeParserTest extends TestCase
{
public function testPipingReadme()
{
$loop = Factory::create();

$input = new Stream(fopen(__DIR__ . '/../README.md', 'r+'), $loop);
$input = new ReadableResourceStream(fopen(__DIR__ . '/../README.md', 'r+'), $loop);
$parser = new ControlCodeParser($input);

$buffer = '';
Expand Down