Update clue/block-react to v0.3

Author: clue

README.md

@@ -90,15 +90,16 @@ you should look into also using [clue/block-react](https://github.com/clue/php-b
 The resulting blocking code could look something like this:
 
 ```php
+use Clue\React\Block;
+
 $loop = React\EventLoop\Factory::create();
 $browser = new Clue\React\Buzz\Browser($loop);
-$blocker = new Clue\React\Block\Blocker($loop);
 
 $client = new Client($url /* change me */, $browser);
 $promise = $client->fetchFile($path /* change me */);
 
 try {
-    $contents = $blocker->awaitOne($promise);
+    $contents = Block\await($promise, $loop);
     // file contents received
 } catch (Exception $e) {
     // an error occured while executing the request

composer.json

@@ -21,6 +21,6 @@
         "neitanod/forceutf8": "~1.4"
     },
     "require-dev": {
-        "clue/block-react": "~0.1.0"
+        "clue/block-react": "~0.3.0"
     }
 }

tests/FunctionalApacheClientTest.php

@@ -4,20 +4,18 @@
 use React\EventLoop\Factory as LoopFactory;
 use Clue\React\Buzz\Browser;
 use React\Promise\PromiseInterface;
-use Clue\React\Block\Blocker;
+use Clue\React\Block;
 
 class FunctionalApacheClientTest extends TestCase
 {
     private $loop;
     private $viewvc;
-    private $blocker;
 
     public function setUp()
     {
         $url = 'http://svn.apache.org/viewvc/';
 
         $this->loop = LoopFactory::create();
-        $this->blocker = new Blocker($this->loop);
         $browser = new Browser($this->loop);
 
         $this->viewvc = new Client($url, $browser);
@@ -28,7 +26,7 @@ public function testFetchDirectory()
         $path = 'jakarta/ecs/';
 
         $promise = $this->viewvc->fetchDirectory($path);
-        $files = $this->waitFor($promise);
+        $files = Block\await($promise, $this->loop);
 
         $this->assertEquals(array('branches/', 'tags/', 'trunk/'), $files);
     }
@@ -39,7 +37,7 @@ public function testFetchFile()
         $revision = '168703';
 
         $promise = $this->viewvc->fetchFile($file, $revision);
-        $recipe = $this->waitFor($promise);
+        $recipe = Block\await($promise, $this->loop);
 
         $this->assertStringStartsWith('/*', $recipe);
     }
@@ -50,7 +48,7 @@ public function testFetchFileOldFileNowDeletedButRevisionAvailable()
         $revision = '1';
 
         $promise = $this->viewvc->fetchFile($file, $revision);
-        $contents = $this->waitFor($promise);
+        $contents = Block\await($promise, $this->loop);
 
         $this->assertStringStartsWith('APACHE COMMONS', $contents);
     }
@@ -64,7 +62,7 @@ public function testFetchFileInvalid()
         $revision = '123';
 
         $promise = $this->viewvc->fetchFile($file, $revision);
-        $this->waitFor($promise);
+        Block\await($promise, $this->loop);
     }
 
     public function testFetchRevisionPrevious()
@@ -73,7 +71,7 @@ public function testFetchRevisionPrevious()
         $revision = '168703';
 
         $promise = $this->viewvc->fetchRevisionPrevious($file, $revision);
-        $revision = $this->waitFor($promise);
+        $revision = Block\await($promise, $this->loop);
 
         $this->assertEquals('168695', $revision);
     }
@@ -87,11 +85,6 @@ public function testFetchRevisionUnknownBase()
         $revision = 'xyz';
 
         $promise = $this->viewvc->fetchRevisionPrevious($file, $revision);
-        $this->waitFor($promise);
-    }
-
-    private function waitFor(PromiseInterface $promise)
-    {
-        return $this->blocker->awaitOne($promise);
+        Block\await($promise, $this->loop);
     }
 }

tests/FunctionalGentooClientTest.php

@@ -4,13 +4,12 @@
 use React\EventLoop\Factory as LoopFactory;
 use Clue\React\Buzz\Browser;
 use React\Promise\PromiseInterface;
-use Clue\React\Block\Blocker;
+use Clue\React\Block;
 
 class FunctionalGentooClientTest extends TestCase
 {
     private $loop;
     private $viewvc;
-    private $blocker;
 
     public function setUp()
     {
@@ -21,14 +20,13 @@ public function setUp()
         $url = 'https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/';
 
         $this->loop = LoopFactory::create();
-        $this->blocker = new Blocker($this->loop);
         $browser = new Browser($this->loop);
 
         // check connectivity to given URL only once
         static $checked = null;
         if ($checked === null) {
             try {
-                $this->waitFor($browser->head($url));
+                Block\await($browser->head($url), $this->loop);
                 $checked = true;
             } catch (Exception $e) {
                 $checked = false;
@@ -47,7 +45,7 @@ public function testFetchDirectoryAttic()
         $path = '/';
 
         $promise = $this->viewvc->fetchDirectory($path, null, true);
-        $files = $this->waitFor($promise);
+        $files = Block\await($promise, $this->loop);
 
         $this->assertEquals(array('misc/', 'src/', 'users/', 'xml/', '.frozen'), $files);
     }
@@ -57,13 +55,8 @@ public function testFetchFileDeletedShowsLastState()
         $file = '.frozen';
 
         $promise = $this->viewvc->fetchFile($file);
-        $contents = $this->waitFor($promise);
+        $contents = Block\await($promise, $this->loop);
 
         $this->assertEquals("robbat2\n", $contents);
     }
-
-    private function waitFor(PromiseInterface $promise)
-    {
-        return $this->blocker->awaitOne($promise);
-    }
 }