resolve IPv6 addresses with amphp/http-client 5

xabbuh · xabbuh · commit 3a732af0e916 · 2024-11-20T16:10:50.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpResolverV5.php b/src/Symfony/Component/HttpClient/Internal/AmpResolverV5.php
@@ -32,19 +32,33 @@ public function __construct(
 
     public function resolve(string $name, ?int $typeRestriction = null, ?Cancellation $cancellation = null): array
     {
-        if (!isset($this->dnsMap[$name]) || !\in_array($typeRestriction, [DnsRecord::A, null], true)) {
+        $recordType = DnsRecord::A;
+        $ip = $this->dnsMap[$name] ?? null;
+
+        if (null !== $ip && str_contains($ip, ':')) {
+            $recordType = DnsRecord::AAAA;
+        }
+
+        if (null === $ip || $recordType !== ($typeRestriction ?? $recordType)) {
             return Dns\resolve($name, $typeRestriction, $cancellation);
         }
 
-        return [new DnsRecord($this->dnsMap[$name], DnsRecord::A, null)];
+        return [new DnsRecord($ip, $recordType, null)];
     }
 
     public function query(string $name, int $type, ?Cancellation $cancellation = null): array
     {
-        if (!isset($this->dnsMap[$name]) || DnsRecord::A !== $type) {
+        $recordType = DnsRecord::A;
+        $ip = $this->dnsMap[$name] ?? null;
+
+        if (null !== $ip && str_contains($ip, ':')) {
+            $recordType = DnsRecord::AAAA;
+        }
+
+        if (null !== $ip || $recordType !== $type) {
             return Dns\resolve($name, $type, $cancellation);
         }
 
-        return [new DnsRecord($this->dnsMap[$name], DnsRecord::A, null)];
+        return [new DnsRecord($ip, $recordType, null)];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,19 +32,33 @@ public function __construct(`
`32`	`32`
`33`	`33`	`public function resolve(string $name, ?int $typeRestriction = null, ?Cancellation $cancellation = null): array`
`34`	`34`	`{`
`35`		`- if (!isset($this->dnsMap[$name]) \|\| !\in_array($typeRestriction, [DnsRecord::A, null], true)) {`
	`35`	`+ $recordType = DnsRecord::A;`
	`36`	`+ $ip = $this->dnsMap[$name] ?? null;`
	`37`	`+`
	`38`	`+ if (null !== $ip && str_contains($ip, ':')) {`
	`39`	`+ $recordType = DnsRecord::AAAA;`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ if (null === $ip \|\| $recordType !== ($typeRestriction ?? $recordType)) {`
`36`	`43`	`return Dns\resolve($name, $typeRestriction, $cancellation);`
`37`	`44`	`}`
`38`	`45`
`39`		`- return [new DnsRecord($this->dnsMap[$name], DnsRecord::A, null)];`
	`46`	`+ return [new DnsRecord($ip, $recordType, null)];`
`40`	`47`	`}`
`41`	`48`
`42`	`49`	`public function query(string $name, int $type, ?Cancellation $cancellation = null): array`
`43`	`50`	`{`
`44`		`- if (!isset($this->dnsMap[$name]) \|\| DnsRecord::A !== $type) {`
	`51`	`+ $recordType = DnsRecord::A;`
	`52`	`+ $ip = $this->dnsMap[$name] ?? null;`
	`53`	`+`
	`54`	`+ if (null !== $ip && str_contains($ip, ':')) {`
	`55`	`+ $recordType = DnsRecord::AAAA;`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ if (null !== $ip \|\| $recordType !== $type) {`
`45`	`59`	`return Dns\resolve($name, $type, $cancellation);`
`46`	`60`	`}`
`47`	`61`
`48`		`- return [new DnsRecord($this->dnsMap[$name], DnsRecord::A, null)];`
	`62`	`+ return [new DnsRecord($ip, $recordType, null)];`
`49`	`63`	`}`
`50`	`64`	`}`