fix: supprot protocol-relative links

codeigniter4 · Mar 27, 2023 · c1f5b60 · c1f5b60
1 parent f7cda3a
commit c1f5b60
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php
@@ -381,8 +381,13 @@ public function baseUrl($relativePath = '', ?string $scheme = null): string
 
  $uri = new self($config, $relativePath, $host, $scheme);
 
+ // For protocol-relative links
+ if ($scheme !== '') {
+ $scheme = $uri->getScheme();
+ }
+
  return URI::createURIString(
- $uri->getScheme(),
+ $scheme,
  $uri->getAuthority(),
  $uri->getPath(),
  $uri->getQuery(),
@@ -420,8 +425,13 @@ public function siteUrl($relativePath = '', ?string $scheme = null, ?App $config
 
  $uri = new self($config, $relativePath, $host, $scheme);
 
+ // For protocol-relative links
+ if ($scheme !== '') {
+ $scheme = $uri->getScheme();
+ }
+
  return URI::createURIString(
- $uri->getScheme(),
+ $scheme,
  $uri->getAuthority(),
  $uri->getPath(),
  $uri->getQuery(),

diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
@@ -147,7 +147,8 @@ class URI
  /**
  * Builds a representation of the string from the component parts.
  *
- * @param string|null $scheme URI scheme. E.g., http, ftp
+ * @param string|null $scheme URI scheme. E.g., http, ftp. Empty string creates
+ * protocol-relative URI.
  *
  * @return string URI string with only passed parts. Maybe incomplete as a URI.
  */
@@ -159,9 +160,14 @@ public static function createURIString(
  ?string $fragment = null
  ): string {
  $uri = '';
+
  if (! empty($scheme)) {
  $uri .= $scheme . '://';
  }
+ // For protocol-relative links
+ elseif ($scheme === '') {
+ $uri .= '//';
+ }
 
  if (! empty($authority)) {
  $uri .= $authority;

diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -33,7 +33,6 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul
 
  assert($currentURI instanceof SiteURI);
 
- // @TODO supprot protocol-relative links
  return $currentURI->siteUrl($relativePath, $scheme, $config);
  }
 }