Skip to content

Commit e45c4af

Browse files
committed
Remove unneeded cyclic dependency on react/socket
1 parent c74a0af commit e45c4af

4 files changed

Lines changed: 4 additions & 7 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ matrix:
2323
sudo: false
2424

2525
install:
26-
- COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install --no-interaction
26+
- composer install --no-interaction
2727

2828
script:
2929
- vendor/bin/phpunit --coverage-text

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,10 @@ It's *highly recommended to use PHP 7+* for this project.
163163
## Tests
164164

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

170168
```bash
171-
$ COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install
169+
$ composer install
172170
```
173171

174172
To run the test suite, go to the project root and run:

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
1010
"react/promise": "^2.1 || ^1.2.1",
1111
"react/promise-timer": "^1.2",
12-
"react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5 || ^0.4.4",
1312
"react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5"
1413
},
1514
"require-dev": {

tests/Query/ExecutorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ private function returnNewConnectionMock($emitData = true)
279279

280280
private function createConnectionMock($emitData = true)
281281
{
282-
$conn = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
282+
$conn = $this->getMockBuilder('React\Stream\DuplexStreamInterface')->getMock();
283283
$conn
284284
->expects($this->any())
285285
->method('on')

0 commit comments

Comments
 (0)