Helpers: Add strtolower() for better scheme compatibility.

janbarasek · web-flow · commit 44dee6af7aa7 · 2020-12-31T16:55:22.000+01:00
diff --git a/src/Helpers.php b/src/Helpers.php
@@ -57,7 +57,7 @@ public static function getBaseUrl(): ?string
 	 */
 	public static function safeUrl(string $s): string
 	{
-		if (strncmp($s, 'http', 4) !== 0) {
+		if (strncmp(strtolower($s), 'http', 4) !== 0) {
 			$s = 'http://' . $s;
 		}
 
@@ -68,7 +68,7 @@ public static function safeUrl(string $s): string
 	public static function parseDomain(string $url): string
 	{
 		$domainPattern = '/^(?:https?:\/\/)?(?<subdomain>[^\/]*?)(?<domain>localhost|(?:\d{1,3}\.?){4}|(?:(?:[a-z0-9-]+)\.(?:[a-z0-9-]+)))(?:\/|$)/';
-		if (preg_match($domainPattern, $url, $parser)) {
+		if (preg_match($domainPattern, strtolower($url), $parser)) {
 			return (string) ($parser['domain'] ?? '');
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static function getBaseUrl(): ?string`
`57`	`57`	`*/`
`58`	`58`	`public static function safeUrl(string $s): string`
`59`	`59`	`{`
`60`		`- if (strncmp($s, 'http', 4) !== 0) {`
	`60`	`+ if (strncmp(strtolower($s), 'http', 4) !== 0) {`
`61`	`61`	`$s = 'http://' . $s;`
`62`	`62`	`}`
`63`	`63`
`@@ -68,7 +68,7 @@ public static function safeUrl(string $s): string`
`68`	`68`	`public static function parseDomain(string $url): string`
`69`	`69`	`{`
`70`	`70`	`$domainPattern = '/^(?:https?:\/\/)?(?<subdomain>[^\/]*?)(?<domain>localhost\|(?:\d{1,3}\.?){4}\|(?:(?:[a-z0-9-]+)\.(?:[a-z0-9-]+)))(?:\/\|$)/';`
`71`		`- if (preg_match($domainPattern, $url, $parser)) {`
	`71`	`+ if (preg_match($domainPattern, strtolower($url), $parser)) {`
`72`	`72`	`return (string) ($parser['domain'] ?? '');`
`73`	`73`	`}`
`74`	`74`