fix yiisoft#17191: improved consistency and readability of UrlManager…

…::createUrl() method
ggh2e3 · Dec 24, 2023 · cdaf6f5 · cdaf6f5
1 parent 4c959b5
commit cdaf6f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
 2.0.50 under development
 ------------------------
 
+- Bug #17191: Fixed `UrlManager::createUrl($params)` method now relies on `BaseUrl::isRelative($url)` method (ggh2e3)
 - Bug #17191: Fixed `BaseUrl::isRelative($url)` method in `yii\helpers\BaseUrl` (ggh2e3)
 - Bug #18469: Fixed `Link::serialize(array $links)` method in `yii\web\Link` (ggh2e3)
 - Bug #20040: Fix type `boolean` in `MSSQL` (terabytesoftw)

diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
@@ -446,22 +446,16 @@ public function createUrl($params)
             }
 
             if ($url !== false) {
-                if (strpos($url, '://') !== false) {
-                    if ($baseUrl !== '' && ($pos = strpos($url, '/', 8)) !== false) {
-                        return substr($url, 0, $pos) . $baseUrl . substr($url, $pos) . $anchor;
-                    }
-
-                    return $url . $baseUrl . $anchor;
-                } elseif (strncmp($url, '//', 2) === 0) {
-                    if ($baseUrl !== '' && ($pos = strpos($url, '/', 2)) !== false) {
-                        return substr($url, 0, $pos) . $baseUrl . substr($url, $pos) . $anchor;
-                    }
+                if (Url::isRelative($url)) {
+                    $url = ltrim($url, '/');
+                    return "$baseUrl/{$url}{$anchor}";
+                }
 
-                    return $url . $baseUrl . $anchor;
+                if ($baseUrl !== '' && ($pos = strpos($url, '/', 8)) !== false) {
+                    return substr($url, 0, $pos) . $baseUrl . substr($url, $pos) . $anchor;
                 }
 
-                $url = ltrim($url, '/');
-                return "$baseUrl/{$url}{$anchor}";
+                return $url . $baseUrl . $anchor;
             }
 
             if ($this->suffix !== null) {