Revert "Clean up annoying 5.3 $that = $this"

This reverts commit 49bb03f.

Author: clue

src/Query/CachedExecutor.php

@@ -18,14 +18,15 @@ public function __construct(ExecutorInterface $executor, RecordCache $cache)
 
     public function query($nameserver, Query $query)
     {
+        $that = $this;
         $executor = $this->executor;
         $cache = $this->cache;
 
         return $this->cache
             ->lookup($query)
             ->then(
-                function ($cachedRecords) use ($query) {
-                    return $this->buildResponse($query, $cachedRecords);
+                function ($cachedRecords) use ($that, $query) {
+                    return $that->buildResponse($query, $cachedRecords);
                 },
                 function () use ($executor, $cache, $nameserver, $query) {
                     return $executor

src/Query/Executor.php

@@ -48,14 +48,15 @@ public function prepareRequest(Query $query)
 
     public function doQuery($nameserver, $transport, $queryData, $name)
     {
+        $that = $this;
         $parser = $this->parser;
         $loop = $this->loop;
 
         $response = new Message();
         $deferred = new Deferred();
 
-        $retryWithTcp = function () use ($nameserver, $queryData, $name) {
-            return $this->doQuery($nameserver, 'tcp', $queryData, $name);
+        $retryWithTcp = function () use ($that, $nameserver, $queryData, $name) {
+            return $that->doQuery($nameserver, 'tcp', $queryData, $name);
         };
 
         $timer = $this->loop->addTimer($this->timeout, function () use (&$conn, $name, $deferred) {

src/Query/RetryExecutor.php

@@ -26,7 +26,8 @@ public function query($nameserver, Query $query)
 
     public function tryQuery($nameserver, Query $query, $retries, $deferred)
     {
-        $errorback = function ($error) use ($nameserver, $query, $retries, $deferred) {
+        $that = $this;
+        $errorback = function ($error) use ($nameserver, $query, $retries, $deferred, $that) {
             if (!$error instanceof TimeoutException) {
                 $deferred->reject($error);
                 return;
@@ -40,7 +41,7 @@ public function tryQuery($nameserver, Query $query, $retries, $deferred)
                 $deferred->reject($error);
                 return;
             }
-            $this->tryQuery($nameserver, $query, $retries-1, $deferred);
+            $that->tryQuery($nameserver, $query, $retries-1, $deferred);
         };
 
         $this->executor

src/Resolver/Resolver.php

@@ -21,11 +21,12 @@ public function __construct($nameserver, ExecutorInterface $executor)
     public function resolve($domain)
     {
         $query = new Query($domain, Message::TYPE_A, Message::CLASS_IN, time());
+        $that = $this;
 
         return $this->executor
             ->query($this->nameserver, $query)
-            ->then(function (Message $response) use ($query) {
-                return $this->extractAddress($query, $response);
+            ->then(function (Message $response) use ($query, $that) {
+                return $that->extractAddress($query, $response);
             });
     }
 

tests/Query/ExecutorTest.php

@@ -213,8 +213,9 @@ public function resolveShouldCloseConnectionOnTimeout()
 
     private function returnStandardResponse()
     {
-        $callback = function ($data, $response) {
-            $this->convertMessageToStandardResponse($response);
+        $that = $this;
+        $callback = function ($data, $response) use ($that) {
+            $that->convertMessageToStandardResponse($response);
             return $response;
         };
 
@@ -223,8 +224,9 @@ private function returnStandardResponse()
 
     private function returnTruncatedResponse()
     {
-        $callback = function ($data, $response) {
-            $this->convertMessageToTruncatedResponse($response);
+        $that = $this;
+        $callback = function ($data, $response) use ($that) {
+            $that->convertMessageToTruncatedResponse($response);
             return $response;
         };