Merge pull request #583 from beyondcode/fix/1.x-buzz-react-fix

[fix/1.x] Replace react-buzz with react-http

Author: rennokki

composer.json

@@ -25,7 +25,6 @@
         "php": "^7.2",
         "ext-json": "*",
         "cboden/ratchet": "^0.4.1",
-        "clue/buzz-react": "^2.5",
         "facade/ignition-contracts": "^1.0",
         "guzzlehttp/psr7": "^1.5",
         "illuminate/broadcasting": "^6.0|^7.0|^8.0",
@@ -35,6 +34,7 @@
         "illuminate/support": "^6.0|^7.0|^8.0",
         "pusher/pusher-php-server": "^3.0|^4.0",
         "react/dns": "^1.1",
+        "react/http": "^1.1",
         "symfony/http-kernel": "^4.0|^5.0",
         "symfony/psr-http-message-bridge": "^1.1|^2.0"
     },

src/Console/StartWebSocketServer.php

@@ -11,13 +11,13 @@
 use BeyondCode\LaravelWebSockets\Statistics\DnsResolver;
 use BeyondCode\LaravelWebSockets\Statistics\Logger\StatisticsLogger as StatisticsLoggerInterface;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
-use Clue\React\Buzz\Browser;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use React\Dns\Config\Config as DnsConfig;
 use React\Dns\Resolver\Factory as DnsFactory;
 use React\Dns\Resolver\ResolverInterface;
 use React\EventLoop\Factory as LoopFactory;
+use React\Http\Browser;
 use React\Socket\Connector;
 
 class StartWebSocketServer extends Command

src/Statistics/Logger/HttpStatisticsLogger.php

@@ -6,9 +6,9 @@
 use BeyondCode\LaravelWebSockets\Statistics\Http\Controllers\WebSocketStatisticsEntriesController;
 use BeyondCode\LaravelWebSockets\Statistics\Statistic;
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
-use Clue\React\Buzz\Browser;
 use function GuzzleHttp\Psr7\stream_for;
 use Ratchet\ConnectionInterface;
+use React\Http\Browser;
 
 class HttpStatisticsLogger implements StatisticsLogger
 {
@@ -18,7 +18,7 @@ class HttpStatisticsLogger implements StatisticsLogger
     /** @var \BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager */
     protected $channelManager;
 
-    /** @var \Clue\React\Buzz\Browser */
+    /** @var \React\Http\Browser */
     protected $browser;
 
     public function __construct(ChannelManager $channelManager, Browser $browser)

tests/TestCase.php

@@ -9,10 +9,10 @@
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler;
 use BeyondCode\LaravelWebSockets\WebSocketsServiceProvider;
-use Clue\React\Buzz\Browser;
 use GuzzleHttp\Psr7\Request;
 use Mockery;
 use Ratchet\ConnectionInterface;
+use React\Http\Browser;
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {