Improve the regex

leofeyer · ausi · web-flow · commit 48a0c3c05e42 · 2020-12-10T11:40:36.000+01:00
Co-authored-by: Martin Auswöger &lt;martin@auswoeger.com&gt;
diff --git a/core-bundle/src/Resources/contao/dca/tl_page.php b/core-bundle/src/Resources/contao/dca/tl_page.php
@@ -1289,9 +1289,9 @@ public function checkDns($varValue)
 
 		// The first part will match IPv6 addresses in square brackets. The
 		// second part will match domain names and IPv4 addresses.
-		preg_match('#(?:^(?:[a-z]+]://)?(\[[0-9a-f:]+]))|(?:^(?:[a-z]+://)?([\pN\pL._-]*))#ui', $varValue, $matches);
+		preg_match('#^(?:[a-z]+://)?(\[[0-9a-f:]+]|[\pN\pL._-]*)#ui', $varValue, $matches);
 
-		return Idna::encode($matches[2] ?? $matches[1]);
+		return Idna::encode($matches[1]);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1289,9 +1289,9 @@ public function checkDns($varValue)`
`1289`	`1289`
`1290`	`1290`	`// The first part will match IPv6 addresses in square brackets. The`
`1291`	`1291`	`// second part will match domain names and IPv4 addresses.`
`1292`		`- preg_match('#(?:^(?:[a-z]+]://)?(\[[0-9a-f:]+]))\|(?:^(?:[a-z]+://)?([\pN\pL._-]*))#ui', $varValue, $matches);`
	`1292`	`+ preg_match('#^(?:[a-z]+://)?(\[[0-9a-f:]+]\|[\pN\pL._-]*)#ui', $varValue, $matches);`
`1293`	`1293`
`1294`		`- return Idna::encode($matches[2] ?? $matches[1]);`
	`1294`	`+ return Idna::encode($matches[1]);`
`1295`	`1295`	`}`
`1296`	`1296`
`1297`	`1297`	`/**`