Skip to content

Add createFromConfig factory methods #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WyriHaximus wants to merge 1 commit into from
Closed

Add createFromConfig factory methods #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@ names, baby!
```php
$loop = React\EventLoop\Factory::create();

$config = React\Dns\Config\Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new React\Dns\Resolver\Factory();
$dns = $factory->create($server, $loop);
$dns = $factory->createFromConfig(React\Dns\Config\Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$dns->resolve('igor.io')->then(function ($ip) {
echo "Host: $ip\n";
Expand Down Expand Up @@ -72,11 +69,8 @@ You can cache results by configuring the resolver to use a `CachedExecutor`:
```php
$loop = React\EventLoop\Factory::create();

$config = React\Dns\Config\Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new React\Dns\Resolver\Factory();
$dns = $factory->createCached($server, $loop);
$dns = $factory->createCachedFromConfig(React\Dns\Config\Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$dns->resolve('igor.io')->then(function ($ip) {
echo "Host: $ip\n";
Expand Down
5 changes: 1 addition & 4 deletions examples/01-one.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@

$loop = React\EventLoop\Factory::create();

$config = Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new Factory();
$resolver = $factory->create($server, $loop);
$resolver = $factory->createFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$name = isset($argv[1]) ? $argv[1] : 'www.google.com';

Expand Down
5 changes: 1 addition & 4 deletions examples/02-concurrent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@

$loop = React\EventLoop\Factory::create();

$config = Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new Factory();
$resolver = $factory->create($server, $loop);
$resolver = $factory->createFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$names = array_slice($argv, 1);
if (!$names) {
Expand Down
5 changes: 1 addition & 4 deletions examples/03-cached.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@

$loop = React\EventLoop\Factory::create();

$config = Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new Factory();
$resolver = $factory->createCached($server, $loop);
$resolver = $factory->createCachedFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$name = isset($argv[1]) ? $argv[1] : 'www.google.com';

Expand Down
5 changes: 1 addition & 4 deletions examples/11-all-ips.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@

$loop = React\EventLoop\Factory::create();

$config = Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new Factory();
$resolver = $factory->create($server, $loop);
$resolver = $factory->createFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$name = isset($argv[1]) ? $argv[1] : 'www.google.com';

Expand Down
5 changes: 1 addition & 4 deletions examples/12-all-types.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@

$loop = React\EventLoop\Factory::create();

$config = Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new Factory();
$resolver = $factory->create($server, $loop);
$resolver = $factory->createFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$name = isset($argv[1]) ? $argv[1] : 'google.com';
$type = constant('React\Dns\Model\Message::TYPE_' . (isset($argv[2]) ? $argv[2] : 'TXT'));
Expand Down
5 changes: 1 addition & 4 deletions examples/13-reverse-dns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@

$loop = React\EventLoop\Factory::create();

$config = Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';

$factory = new Factory();
$resolver = $factory->create($server, $loop);
$resolver = $factory->createFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8');

$ip = isset($argv[1]) ? $argv[1] : '8.8.8.8';

Expand Down
24 changes: 24 additions & 0 deletions src/Resolver/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use React\Cache\ArrayCache;
use React\Cache\CacheInterface;
use React\Dns\Config\Config;
use React\Dns\Config\HostsFile;
use React\Dns\Query\CachingExecutor;
use React\Dns\Query\CoopExecutor;
Expand All @@ -18,6 +19,29 @@

final class Factory
{
/**
* @param Config $config
* @param LoopInterface $loop
* @param string $fallbackNameserver
* @return \React\Dns\Resolver\ResolverInterface
*/
public function createFromConfig(Config $config, LoopInterface $loop, $fallbackNameserver)
{
return self::create($config->nameservers ? reset($config->nameservers) : $fallbackNameserver, $loop);
}

/**
* @param Config $config
* @param LoopInterface $loop
* @param string $fallbackNameserver
* @param ?CacheInterface $cache
* @return \React\Dns\Resolver\ResolverInterface
*/
public function createCachedFromConfig(Config $config, LoopInterface $loop, $fallbackNameserver, CacheInterface $cache = null)
{
return self::createCached($config->nameservers ? reset($config->nameservers) : $fallbackNameserver, $loop, $cache);
}

/**
* @param string $nameserver
* @param LoopInterface $loop
Expand Down
27 changes: 27 additions & 0 deletions tests/Resolver/FactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@

namespace React\Tests\Dns\Resolver;

use React\Dns\Config\Config;
use React\Dns\Resolver\Factory;
use React\Tests\Dns\TestCase;
use React\Dns\Query\HostsFileExecutor;

class FactoryTest extends TestCase
{
/** @test */
public function createFromConfigShouldCreateResolver()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();

$factory = new Factory();
$resolver = $factory->createFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8:53');

$this->assertInstanceOf('React\Dns\Resolver\Resolver', $resolver);
}

/** @test */
public function createShouldCreateResolver()
{
Expand Down Expand Up @@ -159,6 +171,21 @@ public function createCachedShouldCreateResolverWithCachingExecutor()
$this->assertInstanceOf('React\Cache\ArrayCache', $cache);
}

/** @test */
public function createCachedFromConfigShouldCreateResolverWithCachingExecutor()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();

$factory = new Factory();
$resolver = $factory->createCachedFromConfig(Config::loadSystemConfigBlocking(), $loop, '8.8.8.8:53');

$this->assertInstanceOf('React\Dns\Resolver\Resolver', $resolver);
$executor = $this->getResolverPrivateExecutor($resolver);
$this->assertInstanceOf('React\Dns\Query\CachingExecutor', $executor);
$cache = $this->getCachingExecutorPrivateMemberValue($executor, 'cache');
$this->assertInstanceOf('React\Cache\ArrayCache', $cache);
}

/** @test */
public function createCachedShouldCreateResolverWithCachingExecutorWithCustomCache()
{
Expand Down