Deprecate legacy Query::currentTime() to clean up and simplify API

Author: clue

README.md

@@ -127,8 +127,8 @@ $executor = new Executor($loop, new Parser(), new BinaryDumper(), null);
 
 $executor->query(
     '8.8.8.8:53', 
-    new Query($name, Message::TYPE_AAAA, Message::CLASS_IN, time())
-)->done(function (Message $message) {
+    new Query($name, Message::TYPE_AAAA, Message::CLASS_IN)
+)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv6: ' . $answer->data . PHP_EOL;
     }
@@ -154,7 +154,7 @@ $executor = new HostsFileExecutor($hosts, $executor);
 
 $executor->query(
     '8.8.8.8:53', 
-    new Query('localhost', Message::TYPE_A, Message::CLASS_IN, time())
+    new Query('localhost', Message::TYPE_A, Message::CLASS_IN)
 );
 ```
 

examples/04-query-a-and-aaaa.php

@@ -15,15 +15,15 @@
 
 $name = isset($argv[1]) ? $argv[1] : 'www.google.com';
 
-$ipv4Query = new Query($name, Message::TYPE_A, Message::CLASS_IN, time());
-$ipv6Query = new Query($name, Message::TYPE_AAAA, Message::CLASS_IN, time());
+$ipv4Query = new Query($name, Message::TYPE_A, Message::CLASS_IN);
+$ipv6Query = new Query($name, Message::TYPE_AAAA, Message::CLASS_IN);
 
-$executor->query('8.8.8.8:53', $ipv4Query)->done(function (Message $message) {
+$executor->query('8.8.8.8:53', $ipv4Query)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv4: ' . $answer->data . PHP_EOL;
     }
 }, 'printf');
-$executor->query('8.8.8.8:53', $ipv6Query)->done(function (Message $message) {
+$executor->query('8.8.8.8:53', $ipv6Query)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv6: ' . $answer->data . PHP_EOL;
     }

src/Query/Query.php

@@ -7,10 +7,24 @@ class Query
     public $name;
     public $type;
     public $class;
+
+    /**
+     * @deprecated still used internally for BC reasons, should not be used externally.
+     */
     public $currentTime;
 
-    public function __construct($name, $type, $class, $currentTime)
+    /**
+     * @param string   $name        query name, i.e. hostname to look up
+     * @param int      $type        query type, see Message::TYPE_* constants
+     * @param int      $class       query class, see Message::CLASS_IN constant
+     * @param int|null $currentTime (deprecated) still used internally, should not be passed explicitly anymore.
+     */
+    public function __construct($name, $type, $class, $currentTime = null)
     {
+        if($currentTime === null) {
+            $currentTime = time();
+        }
+
         $this->name = $name;
         $this->type = $type;
         $this->class = $class;

src/Resolver/Resolver.php

@@ -20,7 +20,7 @@ public function __construct($nameserver, ExecutorInterface $executor)
 
     public function resolve($domain)
     {
-        $query = new Query($domain, Message::TYPE_A, Message::CLASS_IN, time());
+        $query = new Query($domain, Message::TYPE_A, Message::CLASS_IN);
         $that = $this;
 
         return $this->executor