Forward compatibility with newer ReactPHP components

Author: clue

composer.json

@@ -12,12 +12,13 @@
     ],
     "require": {
         "php": ">=5.3",
-        "evenement/evenement": "~1.0|~2.0",
-        "react/promise": "~1.0|~2.0",
-        "react/socket": "^0.7",
-        "react/event-loop": "0.3.*|0.4.*"
+        "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+        "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
+        "react/promise": "^2.0 || ^1.0",
+        "react/socket": "^1.0 || ^0.8 || ^0.7"
     },
     "require-dev": {
+        "clue/block-react": "^1.2",
         "phpunit/phpunit": "^5.0 || ^4.8"
     },
     "autoload": {

tests/FunctionalTest.php

@@ -1,10 +1,10 @@
 <?php
 
 use Clue\React\Ami\Factory;
-use React\Promise\PromiseInterface;
 use Clue\React\Ami\Client;
 use Clue\React\Ami\ActionSender;
-use Clue\React\Ami\Protocol\Response;
+use Clue\React\Block;
+use React\Promise\PromiseInterface;
 
 class FunctionalTest extends TestCase
 {
@@ -90,23 +90,6 @@ public function testSendRejectedAfterClose(Client $client)
 
     private function waitFor(PromiseInterface $promise)
     {
-        $resolved = null;
-        $exception = null;
-
-        $promise->then(function ($c) use (&$resolved) {
-            $resolved = $c;
-        }, function($error) use (&$exception) {
-            $exception = $error;
-        });
-
-        while ($resolved === null && $exception === null) {
-            self::$loop->tick();
-        }
-
-        if ($exception !== null) {
-            throw $exception;
-        }
-
-        return $resolved;
+        return Block\await($promise, self::$loop, 5.0);
     }
 }