Merge pull request #71 from clue-labs/deps

Lock minimum dependencies and work around circular dependency for tests

Author: WyriHaximus

.travis.yml

@@ -21,7 +21,7 @@ matrix:
 sudo: false
 
 install:
-  - composer install --no-interaction
-  
+  - COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install --no-interaction
+
 script:
   - vendor/bin/phpunit --coverage-text

README.md

@@ -108,10 +108,12 @@ More details about version upgrades can be found in the [CHANGELOG](CHANGELOG.md
 ## Tests
 
 To run the test suite, you first need to clone this repo and then install all
-dependencies [through Composer](http://getcomposer.org):
+dependencies [through Composer](http://getcomposer.org).
+Because the test suite contains some circular dependencies, you may have to
+manually specify the root package version like this:
 
 ```bash
-$ composer install
+$ COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install
 ```
 
 To run the test suite, go to the project root and run:

composer.json

@@ -7,10 +7,10 @@
         "php": ">=5.3.0",
         "react/cache": "~0.4.0|~0.3.0",
         "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",
-        "react/promise": "~2.1|~1.2",
-        "react/promise-timer": "~1.1"
+        "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0 || ^4.8.10"

tests/Query/TimeoutExecutorTest.php

@@ -76,7 +76,7 @@ public function testRejectsPromiseWhenWrappedRejects()
 
     public function testWrappedWillBeCancelledOnTimeout()
     {
-        $this->executor = new TimeoutExecutor($this->wrapped, 0.001, $this->loop);
+        $this->executor = new TimeoutExecutor($this->wrapped, 0, $this->loop);
 
         $cancelled = 0;