Fix for dependency upgrade (#223)

* + DnsResolver no longer extends React/Dns/Resolver as it's now a final class
+ StartWebSocketServer:getDnsResolver returns ResolverInterface to comply with new react/dns policy

* + organize imports

* + organize imports
This commit is contained in:
Gabriel Iuga 2019-07-28 19:18:22 +01:00 committed by Marcel Pociot
parent 639a63bfbb
commit 94fb667b90
2 changed files with 22 additions and 5 deletions

View File

@ -6,9 +6,9 @@ use React\Socket\Connector;
use Clue\React\Buzz\Browser; use Clue\React\Buzz\Browser;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use React\Dns\Config\Config as DnsConfig; use React\Dns\Config\Config as DnsConfig;
use React\Dns\Resolver\ResolverInterface;
use React\EventLoop\Factory as LoopFactory; use React\EventLoop\Factory as LoopFactory;
use React\Dns\Resolver\Factory as DnsFactory; use React\Dns\Resolver\Factory as DnsFactory;
use React\Dns\Resolver\Resolver as ReactDnsResolver;
use BeyondCode\LaravelWebSockets\Statistics\DnsResolver; use BeyondCode\LaravelWebSockets\Statistics\DnsResolver;
use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger; use BeyondCode\LaravelWebSockets\Facades\StatisticsLogger;
use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter; use BeyondCode\LaravelWebSockets\Facades\WebSocketsRouter;
@ -135,7 +135,7 @@ class StartWebSocketServer extends Command
->run(); ->run();
} }
protected function getDnsResolver(): ReactDnsResolver protected function getDnsResolver(): ResolverInterface
{ {
if (! config('websockets.statistics.perform_dns_lookup')) { if (! config('websockets.statistics.perform_dns_lookup')) {
return new DnsResolver; return new DnsResolver;

View File

@ -2,11 +2,13 @@
namespace BeyondCode\LaravelWebSockets\Statistics; namespace BeyondCode\LaravelWebSockets\Statistics;
use React\Dns\Resolver\Resolver;
use React\Promise\FulfilledPromise; use React\Promise\FulfilledPromise;
use React\Dns\Resolver\ResolverInterface;
class DnsResolver extends Resolver class DnsResolver implements ResolverInterface
{ {
private $internalIP = '127.0.0.1';
/* /*
* This empty constructor is needed so we don't have to setup the parent's dependencies. * This empty constructor is needed so we don't have to setup the parent's dependencies.
*/ */
@ -17,6 +19,21 @@ class DnsResolver extends Resolver
public function resolve($domain) public function resolve($domain)
{ {
return new FulfilledPromise('127.0.0.1'); return $this->resolveInternal($domain);
}
public function resolveAll($domain, $type)
{
return $this->resolveInternal($domain, $type);
}
private function resolveInternal($domain, $type = null)
{
return new FulfilledPromise($this->internalIP);
}
public function __toString()
{
return $this->internalIP;
} }
} }