merge

danog · danog · commit aa40bb7ddd8d · 2019-12-22T19:09:12.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,9 @@ sudo: false
 language: php
 
 php:
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
+#  - 7.2
+#  - 7.3
+  - 7.4
   - nightly
 
 matrix:
diff --git a/lib/Internal/HttpsSocket.php b/lib/Internal/HttpsSocket.php
@@ -70,7 +70,7 @@ protected function resolve(Message $message): Promise
                 $request->setBody($data);
                 $request->setHeader('content-type', 'application/dns-message');
                 $request->setHeader('accept', 'application/dns-message');
-                $request->setHeader('content-length', strlen($data));
+                $request->setHeader('content-length', \strlen($data));
                 $request->setHeaders($this->nameserver->getHeaders());
                 break;
             case Nameserver::GOOGLE_JSON:
diff --git a/lib/Internal/Socket.php b/lib/Internal/Socket.php
@@ -146,7 +146,7 @@ private function error(\Throwable $exception)
             $message = "Unexpected error during resolution: ".$exception->getMessage();
             $exception = new DnsException($message, 0, $exception);
         }
-        
+
         $pending = $this->pending;
         $this->pending = [];
 
diff --git a/lib/Rfc8484StubResolver.php b/lib/Rfc8484StubResolver.php
@@ -153,7 +153,7 @@ public function resolve(string $name, int $typeRestriction = null): Promise
                                     foreach ($reason->getReasons() as $reason) {
                                         $reasons []= $reason->getMessage();
                                     }
-                                    $error .= " (".implode(", ", $reasons).")";
+                                    $error .= " (".\implode(", ", $reasons).")";
                                 }
                                 $errors[] = $error;
                             }
@@ -263,7 +263,7 @@ public function query(string $name, int $type): Promise
             $attemptDescription = [];
 
             $exceptions = [];
-            
+
             while ($attempt < $attempts) {
                 try {
                     $attemptDescription[] = $nameserver;

-Original file line number
+Diff line change
 language: php
 php:
 -  - 7.0
 -  - 7.1
 -  - 7.2
 -  - 7.3
 +#  - 7.2
 +#  - 7.3
 +  - 7.4
   - nightly
 matrix:
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private function error(\Throwable $exception)`
`146`	`146`	`$message = "Unexpected error during resolution: ".$exception->getMessage();`
`147`	`147`	`$exception = new DnsException($message, 0, $exception);`
`148`	`148`	`}`
`149`		`-`
	`149`	`+`
`150`	`150`	`$pending = $this->pending;`
`151`	`151`	`$this->pending = [];`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function resolve(string $name, int $typeRestriction = null): Promise`
`153`	`153`	`foreach ($reason->getReasons() as $reason) {`
`154`	`154`	`$reasons []= $reason->getMessage();`
`155`	`155`	`}`
`156`		`- $error .= " (".implode(", ", $reasons).")";`
	`156`	`+ $error .= " (".\implode(", ", $reasons).")";`
`157`	`157`	`}`
`158`	`158`	`$errors[] = $error;`
`159`	`159`	`}`
`@@ -263,7 +263,7 @@ public function query(string $name, int $type): Promise`
`263`	`263`	`$attemptDescription = [];`
`264`	`264`
`265`	`265`	`$exceptions = [];`
`266`		`-`
	`266`	`+`
`267`	`267`	`while ($attempt < $attempts) {`
`268`	`268`	`try {`
`269`	`269`	`$attemptDescription[] = $nameserver;`