Make cancellation more predictable by requiring cancellation support

Author: clue

composer.json

@@ -7,7 +7,7 @@
         "php": ">=5.3.0",
         "react/cache": "~0.4.0|~0.3.0",
         "react/socket": "~0.4.0|~0.3.0",
-        "react/promise": "~2.0|~1.1"
+        "react/promise": "~2.1|~1.2"
     },
     "autoload": {
         "psr-4": { "React\\Dns\\": "src" }

tests/FunctionalResolverTest.php

@@ -35,10 +35,6 @@ public function testResolveInvalidRejects()
 
     public function testResolveCancelledRejectsImmediately()
     {
-        if (!interface_exists('React\Promise\CancellablePromiseInterface')) {
-            $this->markTestSkipped();
-        }
-
         $promise = $this->resolver->resolve('google.com');
         $promise->then($this->expectCallableNever(), $this->expectCallableOnce());
         $promise->cancel();

tests/Query/ExecutorTest.php

@@ -64,10 +64,6 @@ public function resolveShouldCreateTcpRequestIfRequestIsLargerThan512Bytes()
     /** @test */
     public function resolveShouldCloseConnectionWhenCancelled()
     {
-        if (!interface_exists('React\Promise\CancellablePromiseInterface')) {
-            $this->markTestSkipped('Skipped missing CancellablePromiseInterface');
-        }
-
         $conn = $this->createConnectionMock();
         $conn->expects($this->once())->method('close');
 

tests/Query/RetryExecutorTest.php

@@ -133,10 +133,6 @@ public function queryShouldForwardNonTimeoutErrors()
      */
     public function queryShouldCancelQueryOnCancel()
     {
-        if (!interface_exists('React\Promise\CancellablePromiseInterface')) {
-            $this->markTestSkipped('Skipped missing CancellablePromiseInterface');
-        }
-
         $cancelled = 0;
 
         $executor = $this->createExecutorMock();