From 9806d88dba533d46e1cd73c594d20349d8f3695b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Sun, 24 Nov 2024 15:54:33 +0100 Subject: [PATCH] Update tests to avoid using internal classes from reactphp/http --- tests/EventSourceTest.php | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/tests/EventSourceTest.php b/tests/EventSourceTest.php index c9d3025..acef4b5 100644 --- a/tests/EventSourceTest.php +++ b/tests/EventSourceTest.php @@ -4,7 +4,6 @@ use Clue\React\EventSource\EventSource; use PHPUnit\Framework\TestCase; -use React\Http\Io\ReadableBodyStream; use React\Http\Message\Response; use React\Promise\Deferred; use React\Promise\Promise; @@ -286,7 +285,7 @@ public function testConstructorWillReportOpenWhenGetResponseResolvesWithValidRes }); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $this->assertEquals(EventSource::OPEN, $readyState); @@ -307,7 +306,7 @@ public function testConstructorWillReportOpenWhenGetResponseResolvesWithValidRes }); $stream = new ThroughStream(); - $response = new Response(200, array('CONTENT-type' => 'TEXT/Event-Stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('CONTENT-type' => 'TEXT/Event-Stream'), $stream); $deferred->resolve($response); $this->assertEquals(EventSource::OPEN, $readyState); @@ -328,7 +327,7 @@ public function testConstructorWillReportOpenWhenGetResponseResolvesWithValidRes }); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream;charset=utf-8;foo=bar'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream;charset=utf-8;foo=bar'), $stream); $deferred->resolve($response); $this->assertEquals(EventSource::OPEN, $readyState); @@ -350,7 +349,7 @@ public function testCloseResponseStreamWillStartRetryTimerWithErrorEvent() $es = new EventSource('http://example.com', $browser, $loop); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $error = null; @@ -378,7 +377,7 @@ public function testCloseResponseStreamWillNotStartRetryTimerWhenEventSourceIsCl $es = new EventSource('http://example.com', $browser, $loop); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $es->on('error', function ($e) use ($es) { @@ -404,7 +403,7 @@ public function testCloseFromOpenEventWillCloseResponseStreamAndCloseEventSource }); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $this->assertEquals(EventSource::CLOSED, $es->readyState); @@ -421,7 +420,7 @@ public function testEmitMessageWithParsedDataFromEventStream() $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $message = null; @@ -446,7 +445,7 @@ public function testEmitMessageWithParsedIdAndDataOverMultipleRowsFromEventStrea $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $message = null; @@ -471,7 +470,7 @@ public function testEmitMessageWithParsedEventTypeAndDataWithTrailingWhitespaceF $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $message = null; @@ -495,7 +494,7 @@ public function testDoesNotEmitMessageWhenParsedEventStreamHasNoData() $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $message = null; @@ -518,7 +517,7 @@ public function testEmitMessageWithParsedDataAndPreviousIdWhenNotGivenAgainFromE $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $message = null; @@ -543,7 +542,7 @@ public function testEmitMessageOnceWhenCallingCloseFromMessageHandlerFromEventSt $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $message = null; @@ -589,7 +588,7 @@ public function testReconnectAfterStreamClosesUsesLastEventIdFromParsedEventStre $es = new EventSource('http://example.com', $browser, $loop); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $stream->write("id:123\n\n"); @@ -625,7 +624,7 @@ public function testReconnectAfterStreamClosesUsesSpecifiedRetryTime() $es = new EventSource('http://example.com', $browser, $loop); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $stream->write("retry:2543\n\n"); @@ -661,7 +660,7 @@ public function testReconnectAfterStreamClosesIgnoresInvalidRetryTime() $es = new EventSource('http://example.com', $browser, $loop); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $stream->write("retry:now\n\n"); @@ -698,7 +697,7 @@ public function testSplitMessagesWithCarriageReturn() $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $messages = []; @@ -726,7 +725,7 @@ public function testSplitMessagesWithWindowsEndOfLineSequence() $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $messages = []; @@ -754,7 +753,7 @@ public function testSplitMessagesWithBufferedWindowsEndOfLineSequence() $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $messages = []; @@ -783,7 +782,7 @@ public function testSplitMessagesWithMixedEndOfLine() $es = new EventSource('http://example.com', $browser); $stream = new ThroughStream(); - $response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream)); + $response = new Response(200, array('Content-Type' => 'text/event-stream'), $stream); $deferred->resolve($response); $messages = [];