Ne-Lexa / guzzle-doh-middleware

src/DohMiddleware.php

Spacing +5 added lines, -5 removed lines

@@ -119,7 +119,7 @@ 
     ): callable {
         $storage = StorageFactory::create($cache);
 
-        return static function (\Closure $handler) use ($storage, $dohServers, $logger, $debug) {
+        return static function(\Closure $handler) use ($storage, $dohServers, $logger, $debug) {
             /** @psalm-var \Closure(\Psr\Http\Message\RequestInterface, array $options): \GuzzleHttp\Promise\PromiseInterface $handler */
             return new self($handler, $storage, $dohServers, $logger ?? new NullLogger(), $debug);
         };
@@ -171,14 +171,14 @@ 
         $domainName = $dnsRecord->getDomainName();
         $ipAddressesString = implode(',', $ipAddresses);
         $curlOptions[\CURLOPT_RESOLVE] = [
-            $domainName . ':80:' . $ipAddressesString,
-            $domainName . ':443:' . $ipAddressesString,
+            $domainName.':80:'.$ipAddressesString,
+            $domainName.':443:'.$ipAddressesString,
         ];
 
         $port = $request->getUri()->getPort();
 
         if ($port !== null && $port !== 80 && $port !== 443) {
-            $curlOptions[\CURLOPT_RESOLVE][] = $domainName . ':' . $port . ':' . $ipAddressesString;
+            $curlOptions[\CURLOPT_RESOLVE][] = $domainName.':'.$port.':'.$ipAddressesString;
         }
 
         $this->logger->debug(sprintf('[DoH] Set ip addresses %s for domain %s', $ipAddressesString, $domainName));
@@ -186,7 +186,7 @@ 
         $options['curl'] = $curlOptions;
 
         return ($this->nextHandler)($request, $options)->then(
-            static function (ResponseInterface $response) use ($ipAddressesString, $dnsRecord) {
+            static function(ResponseInterface $response) use ($ipAddressesString, $dnsRecord) {
                 if ($dnsRecord->cacheHit) {
                     $cacheTtl = max(0, $dnsRecord->getExpiredAt()->getTimestamp() - time());
                     $response = $response->withHeader(self::HEADER_RESPONSE_CACHE_TTL, (string) $cacheTtl);

src/DomainResolver.php

Spacing +10 added lines, -10 removed lines

@@ -200,20 +200,20 @@
     {
         $encodedDomainName = implode(
             '',
-            array_map(static function (string $domainBit) {
-                return \chr(\strlen($domainBit)) . $domainBit;
+            array_map(static function(string $domainBit) {
+                return \chr(\strlen($domainBit)).$domainBit;
             }, explode('.', $domainName))
         );
 
         return "\xab\xcd"
-            . \chr(1) . \chr(0)
-            . \chr(0) . \chr(1)  // qdc
-            . \chr(0) . \chr(0)  // anc
-            . \chr(0) . \chr(0)  // nsc
-            . \chr(0) . \chr(0)  // arc
-            . $encodedDomainName . \chr(0) // domain name
-            . \chr(0) . \chr(ResourceTypes::A) // resource type
-            . \chr(0) . \chr(1);  // qclass
+            . \chr(1).\chr(0)
+            . \chr(0).\chr(1)  // qdc
+            . \chr(0).\chr(0)  // anc
+            . \chr(0).\chr(0)  // nsc
+            . \chr(0).\chr(0)  // arc
+            . $encodedDomainName.\chr(0) // domain name
+            . \chr(0).\chr(ResourceTypes::A) // resource type
+            . \chr(0).\chr(1); // qclass
     }
 
     private static function encodeRequest(string $request): string

src/Storage/Psr16CacheStorage.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
             return $dnsRecord;
         } catch (InvalidArgumentException $e) {
-            throw new \RuntimeException('Invalid cache key ' . $cacheKey, 0, $e);
+            throw new \RuntimeException('Invalid cache key '.$cacheKey, 0, $e);
         }
     }
 
@@ -52,12 +52,12 @@ 
         try {
             $this->cache->set($cacheKey, $dnsRecord, $dnsRecord->getTTL());
         } catch (InvalidArgumentException $e) {
-            throw new \RuntimeException('Invalid cache key ' . $cacheKey, 0, $e);
+            throw new \RuntimeException('Invalid cache key '.$cacheKey, 0, $e);
         }
     }
 
     private function getCacheKey(string $domainName): string
     {
-        return rawurlencode('guzzle.doh.psr16.' . $domainName);
+        return rawurlencode('guzzle.doh.psr16.'.$domainName);
     }
 }

src/Storage/Psr6CacheStorage.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
             return $dnsRecord;
         } catch (InvalidArgumentException $e) {
-            throw new \RuntimeException('Invalid cache key ' . $cacheKey, 0, $e);
+            throw new \RuntimeException('Invalid cache key '.$cacheKey, 0, $e);
         }
     }
 
@@ -55,12 +55,12 @@ 
             $cacheItem->set($dnsRecord);
             $this->cachePool->save($cacheItem);
         } catch (InvalidArgumentException $e) {
-            throw new \RuntimeException('Invalid cache key ' . $cacheKey, 0, $e);
+            throw new \RuntimeException('Invalid cache key '.$cacheKey, 0, $e);
         }
     }
 
     private function getCacheKey(string $domainName): string
     {
-        return rawurlencode('guzzle.doh.psr6.' . $domainName);
+        return rawurlencode('guzzle.doh.psr6.'.$domainName);
     }
 }