Clean up annoying 5.3 $that = $this

Author: igorw

Query/CachedExecutor.php

@@ -19,15 +19,14 @@ 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 ($that, $query) {
-                    return $that->buildResponse($query, $cachedRecords);
+                function ($cachedRecords) use ($query) {
+                    return $this->buildResponse($query, $cachedRecords);
                 },
                 function () use ($executor, $cache, $nameserver, $query) {
                     return $executor

Query/Executor.php

@@ -48,15 +48,14 @@ 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 ($that, $nameserver, $queryData, $name) {
-            return $that->doQuery($nameserver, 'tcp', $queryData, $name);
+        $retryWithTcp = function () use ($nameserver, $queryData, $name) {
+            return $this->doQuery($nameserver, 'tcp', $queryData, $name);
         };
 
         $timer = $this->loop->addTimer($this->timeout, function () use (&$conn, $name, $deferred) {

Query/RetryExecutor.php

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

Resolver/Resolver.php

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