Fix protocol-relative URLs in Url::to() (#13156) (#13157)

* Fix protocol-relative URLs in `Url::to()` * Use `isRelative()` in `Url::to()`
yiisoft · Dec 11, 2016 · 8e0af24 · 8e0af24
1 parent 2645b5a
commit 8e0af24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/framework/helpers/BaseUrl.php b/framework/helpers/BaseUrl.php
@@ -223,7 +223,7 @@ public static function to($url = '', $scheme = false)
             return $url;
         }
 
-        if (($pos = strpos($url, ':')) === false || !ctype_alpha(substr($url, 0, $pos))) {
+        if (static::isRelative($url)) {
             // turn relative URL into absolute
             $url = static::getUrlManager()->getHostInfo() . '/' . ltrim($url, '/');
         }

diff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php
@@ -186,6 +186,13 @@ public function testTo()
         $this->assertEquals('https://example.com/#test', Url::to('@web5', 'https'));
         $this->assertEquals('//example.com/#test', Url::to('@web5', ''));
 
+        // @see https://github.com/yiisoft/yii2/issues/13156
+        \Yii::setAlias('@cdn', '//cdn.example.com');
+        $this->assertEquals('http://cdn.example.com/images/logo.gif', Url::to('@cdn/images/logo.gif', 'http'));
+        $this->assertEquals('//cdn.example.com/images/logo.gif', Url::to('@cdn/images/logo.gif', ''));
+        $this->assertEquals('https://cdn.example.com/images/logo.gif', Url::to('@cdn/images/logo.gif', 'https'));
+        \Yii::setAlias('@cdn', null);
+
         //In case there is no controller, throw an exception
         $this->removeMockedAction();