From dd6e3c294ac52665a6ce157a9a182a7e36e2a0bc Mon Sep 17 00:00:00 2001
From: Niklas Keller <me@kelunik.com>
Date: Tue, 12 Sep 2017 17:05:40 +0200
Subject: [PATCH] Improve example formatting and add PTR example

---
 examples/_bootstrap.php    | 20 ++++++++++++++++++++
 examples/benchmark.php     | 24 +++++++++---------------
 examples/custom-config.php | 10 ++++++++--
 examples/ptr-record.php    | 16 ++++++++++++++++
 lib/BasicResolver.php      |  6 ++++--
 5 files changed, 57 insertions(+), 19 deletions(-)
 create mode 100644 examples/_bootstrap.php
 create mode 100644 examples/ptr-record.php

diff --git a/examples/_bootstrap.php b/examples/_bootstrap.php
new file mode 100644
index 0000000..d662063
--- /dev/null
+++ b/examples/_bootstrap.php
@@ -0,0 +1,20 @@
+<?php
+
+use Amp\Dns\Record;
+
+require __DIR__ . "/../vendor/autoload.php";
+
+function pretty_print_records(string $queryName, array $records) {
+    print "---------- " . $queryName . " " . str_repeat("-", 55 - strlen($queryName)) . " TTL --\r\n";
+
+    $format = "%-10s %-56s %-5d\r\n";
+
+    foreach ($records as $record) {
+        print sprintf($format, Record::getName($record->getType()), $record->getValue(), $record->getTtl());
+    }
+}
+
+function pretty_print_error(string $queryName, \Throwable $error) {
+    print "-- " . $queryName . " " . str_repeat("-", 70 - strlen($queryName)) . "\r\n";
+    print get_class($error) . ": " . $error->getMessage() . "\r\n";
+}
diff --git a/examples/benchmark.php b/examples/benchmark.php
index b08c2c8..717f163 100644
--- a/examples/benchmark.php
+++ b/examples/benchmark.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/../vendor/autoload.php";
+require __DIR__ . "/_bootstrap.php";
 
 use Amp\Dns;
 use Amp\Loop;
@@ -16,33 +16,27 @@ $domains = array_map(function ($line) {
 array_shift($domains);
 
 Loop::run(function () use ($domains) {
-    print "Starting sequential queries..." . PHP_EOL;
+    print "Starting sequential queries...\r\n\r\n";
 
     $timings = [];
 
     for ($i = 0; $i < 10; $i++) {
         $start = microtime(1);
-        $domain = $domains[mt_rand(0, count($domains) - 1)];
-
-        print $domain . ": ";
+        $domain = $domains[random_int(0, count($domains) - 1)];
 
         try {
-            $records = yield Dns\resolve($domain);
-            $records = array_map(function ($record) {
-                return $record->getValue();
-            }, $records);
-
-            print implode(", ", $records);
+            pretty_print_records($domain, yield Dns\resolve($domain));
         } catch (Dns\ResolutionException $e) {
-            print get_class($e);
+            pretty_print_error($domain, $e);
         }
 
         $time = round(microtime(1) - $start, 2);
         $timings[] = $time;
 
-        print " in " . $time . " ms" . PHP_EOL;
+        printf("%'-74s\r\n\r\n", " in " . $time . " ms");
     }
 
-    print PHP_EOL;
-    print (array_sum($timings) / count($timings)) . " ms for an average query." . PHP_EOL;
+    $averageTime = array_sum($timings) / count($timings);
+
+    print "{$averageTime} ms for an average query." . PHP_EOL;
 });
diff --git a/examples/custom-config.php b/examples/custom-config.php
index 4337e82..166d4da 100644
--- a/examples/custom-config.php
+++ b/examples/custom-config.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/../vendor/autoload.php";
+require __DIR__ . "/_bootstrap.php";
 
 use Amp\Dns;
 use Amp\Loop;
@@ -22,5 +22,11 @@ $customConfigLoader = new class implements Dns\ConfigLoader {
 Dns\resolver(new Dns\BasicResolver(null, $customConfigLoader));
 
 Loop::run(function () {
-    var_dump(yield Dns\resolve("google.com"));
+    $hostname = "amphp.org";
+
+    try {
+        pretty_print_records($hostname, yield Dns\resolve($hostname));
+    } catch (Dns\ResolutionException $e) {
+        pretty_print_error($hostname, $e);
+    }
 });
diff --git a/examples/ptr-record.php b/examples/ptr-record.php
new file mode 100644
index 0000000..6424d18
--- /dev/null
+++ b/examples/ptr-record.php
@@ -0,0 +1,16 @@
+<?php
+
+require __DIR__ . "/_bootstrap.php";
+
+use Amp\Dns;
+use Amp\Loop;
+
+Loop::run(function () {
+    $ip = "8.8.8.8";
+
+    try {
+        pretty_print_records($ip, yield Dns\query($ip, Dns\Record::PTR));
+    } catch (Dns\ResolutionException $e) {
+        pretty_print_error($ip, $e);
+    }
+});
diff --git a/lib/BasicResolver.php b/lib/BasicResolver.php
index 7cdb9e3..8f3db05 100644
--- a/lib/BasicResolver.php
+++ b/lib/BasicResolver.php
@@ -174,8 +174,10 @@ final class BasicResolver implements Resolver {
 
     /** @inheritdoc */
     public function query(string $name, int $type): Promise {
-        if (isset($this->pendingQueries[$type . " " . $name])) {
-            return $this->pendingQueries[$type . " " . $name];
+        $pendingQueryKey = $type . " " . $name;
+
+        if (isset($this->pendingQueries[$pendingQueryKey])) {
+            return $this->pendingQueries[$pendingQueryKey];
         }
 
         $promise = call(function () use ($name, $type) {