Skip to content

Commit 2e44700

Browse files
clueclue
committed
Update test suite to support new reactphp/http v1.10.0 
1 parent d1877a0 commit 2e44700

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"php": ">=5.4",
1515
"evenement/evenement": "^3.0 || ^2.0",
1616
"react/event-loop": "^1.2",
17-
"react/http": "^1.6",
17+
"react/http": "^1.10",
1818
"react/promise": "^3 || ^2.10 || ^1.2.1"
1919
},
2020
"require-dev": {

‎tests/EventSourceTest.php‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
use Clue\React\EventSource\EventSource;
66
use PHPUnit\Framework\TestCase;
7-
use React\Http\Io\ReadableBodyStream;
7+
use React\Http\Message\Response;
88
use React\Promise\Deferred;
99
use React\Promise\Promise;
1010
use React\Stream\ThroughStream;
11-
use RingCentral\Psr7\Response;
1211

1312
class EventSourceTest extends TestCase
1413
{
@@ -274,7 +273,7 @@ public function testConstructorWillReportOpenWhenGetResponseResolvesWithValidRes
274273
});
275274

276275
$stream = new ThroughStream();
277-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
276+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
278277
$deferred->resolve($response);
279278

280279
$this->assertEquals(EventSource::OPEN, $readyState);
@@ -295,7 +294,7 @@ public function testConstructorWillReportOpenWhenGetResponseResolvesWithValidRes
295294
});
296295

297296
$stream = new ThroughStream();
298-
$response = new Response(200, array('CONTENT-type' => 'TEXT/Event-Stream'), new ReadableBodyStream($stream));
297+
$response = new Response(200, array('CONTENT-type' => 'TEXT/Event-Stream'), $stream);
299298
$deferred->resolve($response);
300299

301300
$this->assertEquals(EventSource::OPEN, $readyState);
@@ -316,7 +315,7 @@ public function testConstructorWillReportOpenWhenGetResponseResolvesWithValidRes
316315
});
317316

318317
$stream = new ThroughStream();
319-
$response = new Response(200, array('Content-Type' => 'text/event-stream;charset=utf-8;foo=bar'), new ReadableBodyStream($stream));
318+
$response = new Response(200, array('Content-Type' => 'text/event-stream;charset=utf-8;foo=bar'), $stream);
320319
$deferred->resolve($response);
321320

322321
$this->assertEquals(EventSource::OPEN, $readyState);
@@ -338,7 +337,7 @@ public function testCloseResponseStreamWillStartRetryTimerWithErrorEvent()
338337
$es = new EventSource('http://example.com', $browser, $loop);
339338

340339
$stream = new ThroughStream();
341-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
340+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
342341
$deferred->resolve($response);
343342

344343
$error = null;
@@ -366,7 +365,7 @@ public function testCloseResponseStreamWillNotStartRetryTimerWhenEventSourceIsCl
366365
$es = new EventSource('http://example.com', $browser, $loop);
367366

368367
$stream = new ThroughStream();
369-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
368+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
370369
$deferred->resolve($response);
371370

372371
$es->on('error', function ($e) use ($es) {
@@ -392,7 +391,7 @@ public function testCloseFromOpenEventWillCloseResponseStreamAndCloseEventSource
392391
});
393392

394393
$stream = new ThroughStream();
395-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
394+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
396395
$deferred->resolve($response);
397396

398397
$this->assertEquals(EventSource::CLOSED, $es->readyState);
@@ -409,7 +408,7 @@ public function testEmitMessageWithParsedDataFromEventStream()
409408
$es = new EventSource('http://example.com', $browser);
410409

411410
$stream = new ThroughStream();
412-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
411+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
413412
$deferred->resolve($response);
414413

415414
$message = null;
@@ -434,7 +433,7 @@ public function testEmitMessageWithParsedIdAndDataOverMultipleRowsFromEventStrea
434433
$es = new EventSource('http://example.com', $browser);
435434

436435
$stream = new ThroughStream();
437-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
436+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
438437
$deferred->resolve($response);
439438

440439
$message = null;
@@ -459,7 +458,7 @@ public function testEmitMessageWithParsedEventTypeAndDataWithTrailingWhitespaceF
459458
$es = new EventSource('http://example.com', $browser);
460459

461460
$stream = new ThroughStream();
462-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
461+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
463462
$deferred->resolve($response);
464463

465464
$message = null;
@@ -483,7 +482,7 @@ public function testDoesNotEmitMessageWhenParsedEventStreamHasNoData()
483482
$es = new EventSource('http://example.com', $browser);
484483

485484
$stream = new ThroughStream();
486-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
485+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
487486
$deferred->resolve($response);
488487

489488
$message = null;
@@ -506,7 +505,7 @@ public function testEmitMessageWithParsedDataAndPreviousIdWhenNotGivenAgainFromE
506505
$es = new EventSource('http://example.com', $browser);
507506

508507
$stream = new ThroughStream();
509-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
508+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
510509
$deferred->resolve($response);
511510

512511
$message = null;
@@ -531,7 +530,7 @@ public function testEmitMessageOnceWhenCallingCloseFromMessageHandlerFromEventSt
531530
$es = new EventSource('http://example.com', $browser);
532531

533532
$stream = new ThroughStream();
534-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
533+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
535534
$deferred->resolve($response);
536535

537536
$message = null;
@@ -577,7 +576,7 @@ public function testReconnectAfterStreamClosesUsesLastEventIdFromParsedEventStre
577576
$es = new EventSource('http://example.com', $browser, $loop);
578577

579578
$stream = new ThroughStream();
580-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
579+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
581580
$deferred->resolve($response);
582581

583582
$stream->write("id:123\n\n");
@@ -613,7 +612,7 @@ public function testReconnectAfterStreamClosesUsesSpecifiedRetryTime()
613612
$es = new EventSource('http://example.com', $browser, $loop);
614613

615614
$stream = new ThroughStream();
616-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
615+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
617616
$deferred->resolve($response);
618617

619618
$stream->write("retry:2543\n\n");
@@ -649,7 +648,7 @@ public function testReconnectAfterStreamClosesIgnoresInvalidRetryTime()
649648
$es = new EventSource('http://example.com', $browser, $loop);
650649

651650
$stream = new ThroughStream();
652-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
651+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
653652
$deferred->resolve($response);
654653

655654
$stream->write("retry:now\n\n");
@@ -686,7 +685,7 @@ public function testSplitMessagesWithCarriageReturn()
686685
$es = new EventSource('http://example.com', $browser);
687686

688687
$stream = new ThroughStream();
689-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
688+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
690689
$deferred->resolve($response);
691690

692691
$messages = [];
@@ -714,7 +713,7 @@ public function testSplitMessagesWithWindowsEndOfLineSequence()
714713
$es = new EventSource('http://example.com', $browser);
715714

716715
$stream = new ThroughStream();
717-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
716+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
718717
$deferred->resolve($response);
719718

720719
$messages = [];
@@ -742,7 +741,7 @@ public function testSplitMessagesWithBufferedWindowsEndOfLineSequence()
742741
$es = new EventSource('http://example.com', $browser);
743742

744743
$stream = new ThroughStream();
745-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
744+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
746745
$deferred->resolve($response);
747746

748747
$messages = [];
@@ -771,7 +770,7 @@ public function testSplitMessagesWithMixedEndOfLine()
771770
$es = new EventSource('http://example.com', $browser);
772771

773772
$stream = new ThroughStream();
774-
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
773+
$response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream);
775774
$deferred->resolve($response);
776775

777776
$messages = [];

0 commit comments

Comments
 (0)