Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ matrix:
sudo: false

install:
- COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install --no-interaction
- composer install --no-interaction

script:
- vendor/bin/phpunit --coverage-text
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,10 @@ It's *highly recommended to use PHP 7+* for this project.
## Tests

To run the test suite, you first need to clone this repo and then install all
dependencies [through Composer](https://getcomposer.org).
Because the test suite contains some circular dependencies, you may have to
manually specify the root package version like this:
dependencies [through Composer](https://getcomposer.org):

```bash
$ COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install
$ composer install
```

To run the test suite, go to the project root and run:
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
"react/promise": "^2.1 || ^1.2.1",
"react/promise-timer": "^1.2",
"react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5 || ^0.4.4",
"react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion tests/Query/ExecutorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ private function returnNewConnectionMock($emitData = true)

private function createConnectionMock($emitData = true)
{
$conn = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
$conn = $this->getMockBuilder('React\Stream\DuplexStreamInterface')->getMock();
$conn
->expects($this->any())
->method('on')
Expand Down