Auth option for urls

Author: SmetDenis

src/Url.php

@@ -105,11 +105,12 @@ public static function addArg(array $newParams, $uri = null)
     /**
      * Return the current URL.
      *
+     * @param bool $addAuth
      * @return string
      */
-    public static function current()
+    public static function current($addAuth = false)
     {
-        $current = (string)self::root() . (string)self::path();
+        $current = (string)self::root($addAuth) . (string)self::path();
         return $current ? $current : null;
     }
 
@@ -142,19 +143,22 @@ public static function path()
     /**
      * Return current root URL
      *
-     * @return string
+     * @param bool $addAuth
+     * @return null|string
      *
      * @SuppressWarnings(PHPMD.Superglobals)
      */
-    public static function root()
+    public static function root($addAuth = false)
     {
         $url = '';
 
         // Check to see if it's over https
         $isHttps = self::isHttps();
 
         // Was a username or password passed?
-        $url .= self::getAuth();
+        if ($addAuth) {
+            $url .= self::getAuth();
+        }
 
         // We want the user to stay on the same host they are currently on,
         // but beware of security issues

tests/UrlTest.php

@@ -41,9 +41,13 @@ public function testRootPath()
         // Test server auth.
         $_SERVER['PHP_AUTH_USER'] = 'admin';
         $_SERVER['PHP_AUTH_PW']   = '123456';
-        is('http://admin:[email protected]', Url::root());
+        is('http://admin:[email protected]', Url::root(true));
+        is('http://test.dev', Url::root(false));
+        is('http://test.dev', Url::root());
         is('/test.php?foo=bar', Url::path());
-        is('http://admin:[email protected]/test.php?foo=bar', Url::current());
+        is('http://admin:[email protected]/test.php?foo=bar', Url::current(true));
+        is('http://test.dev/test.php?foo=bar', Url::current(false));
+        is('http://test.dev/test.php?foo=bar', Url::current());
 
         // Test port.
         unset($_SERVER['PHP_AUTH_USER']);