Skip to content

Commit b456e9b

Browse files
clueclue
committed
Update to use new reactphp/async package instead of clue/reactphp-block
1 parent 8de2763 commit b456e9b

15 files changed

+129
-114
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"react/stream": "^1.2"
3636
},
3737
"require-dev": {
38-
"clue/block-react": "^1.5",
3938
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
39+
"react/async": "^4 || ^3 || ^2",
4040
"react/promise-stream": "^1.2"
4141
},
4242
"autoload": {

‎tests/FdServerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ public function testServerEmitsConnectionEventForNewConnection()
321321
$server->on('connection', $resolve);
322322
});
323323

324-
$connection = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, 1.0));
324+
$connection = \React\Async\await(\React\Promise\Timer\timeout($promise, 1.0));
325325

326326
/**
327327
* @var ConnectionInterface $connection

‎tests/FunctionalConnectorTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function connectionToTcpServerShouldSucceedWithLocalhost()
2323

2424
$connector = new Connector(array());
2525

26-
$connection = \Clue\React\Block\await(\React\Promise\Timer\timeout($connector->connect('localhost:9998'), self::TIMEOUT));
26+
$connection = \React\Async\await(\React\Promise\Timer\timeout($connector->connect('localhost:9998'), self::TIMEOUT));
2727

2828
$server->close();
2929

@@ -62,11 +62,11 @@ public function testConnectTwiceWithoutHappyEyeBallsOnlySendsSingleDnsQueryDueTo
6262
fclose($client);
6363
});
6464

65-
$connection = \Clue\React\Block\await($connector->connect('example.com:80'));
65+
$connection = \React\Async\await($connector->connect('example.com:80'));
6666
$connection->close();
6767
$this->assertEquals(1, $received);
6868

69-
$connection = \Clue\React\Block\await($connector->connect('example.com:80'));
69+
$connection = \React\Async\await($connector->connect('example.com:80'));
7070
$connection->close();
7171
$this->assertEquals(1, $received);
7272

@@ -84,7 +84,7 @@ public function connectionToRemoteTCP4n6ServerShouldResultInOurIP()
8484

8585
$connector = new Connector(array('happy_eyeballs' => true));
8686

87-
$ip = \Clue\React\Block\await(\React\Promise\Timer\timeout($this->request('dual.tlund.se', $connector), self::TIMEOUT));
87+
$ip = \React\Async\await(\React\Promise\Timer\timeout($this->request('dual.tlund.se', $connector), self::TIMEOUT));
8888

8989
$this->assertNotFalse(inet_pton($ip));
9090
}
@@ -98,7 +98,7 @@ public function connectionToRemoteTCP4ServerShouldResultInOurIP()
9898
$connector = new Connector(array('happy_eyeballs' => true));
9999

100100
try {
101-
$ip = \Clue\React\Block\await(\React\Promise\Timer\timeout($this->request('ipv4.tlund.se', $connector), self::TIMEOUT));
101+
$ip = \React\Async\await(\React\Promise\Timer\timeout($this->request('ipv4.tlund.se', $connector), self::TIMEOUT));
102102
} catch (\Exception $e) {
103103
$this->checkIpv4();
104104
throw $e;
@@ -117,7 +117,7 @@ public function connectionToRemoteTCP6ServerShouldResultInOurIP()
117117
$connector = new Connector(array('happy_eyeballs' => true));
118118

119119
try {
120-
$ip = \Clue\React\Block\await(\React\Promise\Timer\timeout($this->request('ipv6.tlund.se', $connector), self::TIMEOUT));
120+
$ip = \React\Async\await(\React\Promise\Timer\timeout($this->request('ipv6.tlund.se', $connector), self::TIMEOUT));
121121
} catch (\Exception $e) {
122122
$this->checkIpv6();
123123
throw $e;
@@ -150,11 +150,11 @@ public function testCancelPendingTlsConnectionDuringTlsHandshakeShouldCloseTcpCo
150150
});
151151
});
152152

153-
\Clue\React\Block\await(\React\Promise\Timer\timeout($deferred->promise(), self::TIMEOUT));
153+
\React\Async\await(\React\Promise\Timer\timeout($deferred->promise(), self::TIMEOUT));
154154
$server->close();
155155

156156
try {
157-
\Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
157+
\React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
158158
$this->fail();
159159
} catch (\Exception $e) {
160160
$this->assertInstanceOf('RuntimeException', $e);

‎tests/FunctionalSecureServerTest.php

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testClientCanConnectToServer()
3737
$promise = $connector->connect($server->getAddress());
3838

3939
/* @var ConnectionInterface $client */
40-
$client = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
40+
$client = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
4141

4242
$this->assertInstanceOf('React\Socket\ConnectionInterface', $client);
4343
$this->assertEquals($server->getAddress(), $client->getRemoteAddress());
@@ -66,7 +66,7 @@ public function testClientUsesTls13ByDefaultWhenSupportedByOpenSSL()
6666
$promise = $connector->connect($server->getAddress());
6767

6868
/* @var ConnectionInterface $client */
69-
$client = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
69+
$client = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
7070

7171
$this->assertInstanceOf('React\Socket\Connection', $client);
7272
$this->assertTrue(isset($client->stream));
@@ -105,7 +105,7 @@ public function testClientUsesTls12WhenCryptoMethodIsExplicitlyConfiguredByClien
105105
$promise = $connector->connect($server->getAddress());
106106

107107
/* @var ConnectionInterface $client */
108-
$client = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
108+
$client = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
109109

110110
$this->assertInstanceOf('React\Socket\Connection', $client);
111111
$this->assertTrue(isset($client->stream));
@@ -136,7 +136,7 @@ public function testClientUsesTls12WhenCryptoMethodIsExplicitlyConfiguredByServe
136136
$promise = $connector->connect($server->getAddress());
137137

138138
/* @var ConnectionInterface $client */
139-
$client = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
139+
$client = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
140140

141141
$this->assertInstanceOf('React\Socket\Connection', $client);
142142
$this->assertTrue(isset($client->stream));
@@ -168,7 +168,7 @@ public function testClientUsesTls10WhenCryptoMethodIsExplicitlyConfiguredByClien
168168

169169
/* @var ConnectionInterface $client */
170170
try {
171-
$client = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
171+
$client = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
172172
} catch (\RuntimeException $e) {
173173
// legacy TLS 1.0 would be considered insecure by today's standards, so skip test if connection fails
174174
// OpenSSL error messages are version/platform specific
@@ -210,7 +210,7 @@ public function testServerEmitsConnectionForClientConnection()
210210

211211
// await both client and server side end of connection
212212
/* @var ConnectionInterface[] $both */
213-
$both = \Clue\React\Block\await(\React\Promise\Timer\timeout(\React\Promise\all(array($peer, $client)), self::TIMEOUT));
213+
$both = \React\Async\await(\React\Promise\Timer\timeout(\React\Promise\all(array($peer, $client)), self::TIMEOUT));
214214

215215
// both ends of the connection are represented by different instances of ConnectionInterface
216216
$this->assertCount(2, $both);
@@ -250,7 +250,7 @@ public function testClientEmitsDataEventOnceForDataWrittenFromServer()
250250
}, $reject);
251251
});
252252

253-
$data = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
253+
$data = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
254254

255255
$this->assertEquals('foo', $data);
256256

@@ -291,7 +291,7 @@ public function testWritesDataInMultipleChunksToConnection()
291291
}, $reject);
292292
});
293293

294-
$received = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
294+
$received = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
295295

296296
$this->assertEquals(400000, $received);
297297

@@ -332,7 +332,7 @@ public function testWritesMoreDataInMultipleChunksToConnection()
332332
}, $reject);
333333
});
334334

335-
$received = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
335+
$received = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
336336

337337
$this->assertEquals(2000000, $received);
338338

@@ -365,7 +365,7 @@ public function testEmitsDataFromConnection()
365365
$connection->write('foo');
366366
});
367367

368-
$data = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
368+
$data = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
369369

370370
$this->assertEquals('foo', $data);
371371

@@ -405,7 +405,7 @@ public function testEmitsDataInMultipleChunksFromConnection()
405405
$connection->write(str_repeat('*', 400000));
406406
});
407407

408-
$received = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
408+
$received = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
409409

410410
$this->assertEquals(400000, $received);
411411

@@ -447,7 +447,7 @@ public function testPipesDataBackInMultipleChunksFromConnection()
447447
}, $reject);
448448
});
449449

450-
$received = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
450+
$received = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
451451

452452
$this->assertEquals(400000, $received);
453453

@@ -477,7 +477,7 @@ public function testEmitsConnectionForNewTlsv11Connection()
477477
));
478478
$promise = $connector->connect($server->getAddress());
479479

480-
\Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
480+
\React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
481481

482482
$server->close();
483483
$promise->then(function (ConnectionInterface $connection) {
@@ -508,7 +508,7 @@ public function testEmitsErrorForClientWithTlsVersionMismatch()
508508
$this->setExpectedException('RuntimeException', 'handshake');
509509

510510
try {
511-
\Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
511+
\React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
512512
} catch (\Exception $e) {
513513
$server->close();
514514

@@ -534,7 +534,7 @@ public function testServerEmitsConnectionForNewConnectionWithEncryptedCertificat
534534
));
535535
$connector->connect($server->getAddress());
536536

537-
$connection = \Clue\React\Block\await(\React\Promise\Timer\timeout($peer, self::TIMEOUT));
537+
$connection = \React\Async\await(\React\Promise\Timer\timeout($peer, self::TIMEOUT));
538538

539539
$this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
540540

@@ -557,7 +557,7 @@ public function testClientRejectsWithErrorForServerWithInvalidCertificate()
557557
$this->setExpectedException('RuntimeException', 'handshake');
558558

559559
try {
560-
\Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
560+
\React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
561561
} catch (\Exception $e) {
562562
$server->close();
563563

@@ -587,7 +587,7 @@ public function testServerEmitsErrorForClientWithInvalidCertificate()
587587
$this->setExpectedException('RuntimeException', 'handshake');
588588

589589
try {
590-
\Clue\React\Block\await(\React\Promise\Timer\timeout($peer, self::TIMEOUT));
590+
\React\Async\await(\React\Promise\Timer\timeout($peer, self::TIMEOUT));
591591
} catch (\Exception $e) {
592592
$server->close();
593593

@@ -616,7 +616,7 @@ public function testEmitsErrorForServerWithEncryptedCertificateMissingPassphrase
616616
$this->setExpectedException('RuntimeException', 'handshake');
617617

618618
try {
619-
\Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
619+
\React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
620620
} catch (\Exception $e) {
621621
$server->close();
622622

@@ -646,7 +646,7 @@ public function testEmitsErrorForServerWithEncryptedCertificateWithInvalidPassph
646646
$this->setExpectedException('RuntimeException', 'handshake');
647647

648648
try {
649-
\Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
649+
\React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
650650
} catch (\Exception $e) {
651651
$server->close();
652652

@@ -669,7 +669,7 @@ public function testEmitsErrorForConnectionWithPeerVerification()
669669
$promise = $connector->connect($server->getAddress());
670670
$promise->then(null, $this->expectCallableOnce());
671671

672-
\Clue\React\Block\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
672+
\React\Async\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
673673

674674
$server->close();
675675
}
@@ -694,7 +694,7 @@ public function testEmitsErrorIfConnectionIsCancelled()
694694
$promise->cancel();
695695
$promise->then(null, $this->expectCallableOnce());
696696

697-
\Clue\React\Block\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
697+
\React\Async\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
698698

699699
$server->close();
700700
}
@@ -715,7 +715,7 @@ public function testEmitsErrorIfConnectionIsClosedBeforeHandshake()
715715
$stream->close();
716716
});
717717

718-
$error = \Clue\React\Block\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
718+
$error = \React\Async\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
719719

720720
// Connection from tcp://127.0.0.1:39528 failed during TLS handshake: Connection lost during TLS handshake (ECONNRESET)
721721
$this->assertInstanceOf('RuntimeException', $error);
@@ -743,7 +743,7 @@ public function testEmitsErrorIfConnectionIsClosedWithIncompleteHandshake()
743743
$stream->end("\x1e");
744744
});
745745

746-
$error = \Clue\React\Block\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
746+
$error = \React\Async\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
747747

748748
// Connection from tcp://127.0.0.1:39528 failed during TLS handshake: Connection lost during TLS handshake (ECONNRESET)
749749
$this->assertInstanceOf('RuntimeException', $error);
@@ -767,7 +767,7 @@ public function testEmitsNothingIfPlaintextConnectionIsIdle()
767767
$connector = new TcpConnector();
768768
$promise = $connector->connect(str_replace('tls://', '', $server->getAddress()));
769769

770-
$connection = \Clue\React\Block\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
770+
$connection = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
771771
$this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
772772

773773
$server->close();
@@ -792,7 +792,7 @@ public function testEmitsErrorIfConnectionIsHttpInsteadOfSecureHandshake()
792792
$stream->write("GET / HTTP/1.0\r\n\r\n");
793793
});
794794

795-
$error = \Clue\React\Block\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
795+
$error = \React\Async\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
796796

797797
$this->assertInstanceOf('RuntimeException', $error);
798798

@@ -821,7 +821,7 @@ public function testEmitsErrorIfConnectionIsUnknownProtocolInsteadOfSecureHandsh
821821
$stream->write("Hello world!\n");
822822
});
823823

824-
$error = \Clue\React\Block\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
824+
$error = \React\Async\await(\React\Promise\Timer\timeout($errorEvent, self::TIMEOUT));
825825

826826
$this->assertInstanceOf('RuntimeException', $error);
827827

0 commit comments

Comments
 (0)