Improve User Info handling

- Component formatting simplified
- User Info are now rawurlencoded
- Fix Http::createFromServer to work with HTTP_AUTHORIZATION

CHANGELOG.md

@@ -10,6 +10,8 @@ All Notable changes to `League\Url` will be documented in this file
 
 ### Fixed
 
+- [BUG FIX] `User` and `Pass` encoding
+- [BUG FIX] `Http::createFromServer` handling userinfo when not using `mod_php` 'HTTP_AUTHORIZATION'
 - [BUG FIX] `UriParser` handling URI strings with invalid scheme
 - [BUG FIX] `QueryParser` handling numeric index [issue #25](https://github.com/thephpleague/uri/issues/25)
 - [BUG FIX] `DataPath` mimetype syntax validation [issue #21](https://github.com/thephpleague/uri/issues/21)

src/Components/DataPath.php

@@ -307,7 +307,7 @@ protected static function format($mimetype, $parameters, $isBinaryData, $data)
             $parameters .= ';'.static::BINARY_PARAMETER;
         }
 
-        return static::encodePath($mimetype.$parameters.','.$data);
+        return static::encode($mimetype.$parameters.','.$data);
     }
 
     /**

src/Components/HierarchicalPath.php

@@ -121,7 +121,7 @@ public function __toString()
         }
         $path = $front_delimiter.implode(static::$separator, array_map([$this, 'encode'], $this->data));
 
-        return $this->encodePath($path);
+        return $this->encode($path);
     }
 
     /**

src/Components/Path.php

@@ -82,6 +82,6 @@ protected function validate($path)
      */
     public function __toString()
     {
-        return $this->encodePath(static::encode($this->data));
+        return static::encode($this->data);
     }
 }

src/Components/PathTrait.php

@@ -195,21 +195,6 @@ public function withTypecode($type)
         return $this->modify($path.$extension);
     }
 
-    /**
-     * Normalize path encoding
-     *
-     * @param string $path the path to normalize
-     *
-     * @param string
-     *
-     */
-    protected static function encodePath($path)
-    {
-        return preg_replace_callback(',(?<encode>%[0-9A-F]{2}),i', function (array $matches) {
-            return strtoupper($matches['encode']);
-        }, $path);
-    }
-
     /**
      * Encode a segment or the entire path string
      *

src/Schemes/Http.php

@@ -96,9 +96,19 @@ protected static function fetchServerScheme(array $server)
      */
     protected static function fetchServerUserInfo(array $server)
     {
-        $server += ['PHP_AUTH_USER' => null, 'PHP_AUTH_PW' => null];
+        $server += ['PHP_AUTH_USER' => null, 'PHP_AUTH_PW' => null, 'HTTP_AUTHORIZATION' => null];
+        $parser = new UriParser();
+        if (!empty($server['HTTP_AUTHORIZATION'])
+            && 0 === strpos(strtolower($server['HTTP_AUTHORIZATION']), 'basic')
+        ) {
+            $res = explode(':', base64_decode(substr($server['HTTP_AUTHORIZATION'], 6)), 2);
+            $login = array_shift($res);
+            $pass = array_shift($res);
+
+            return $parser->buildUserInfo(rawurlencode($login), rawurlencode($pass));
+        }
 
-        return (new UriParser())->buildUserInfo($server['PHP_AUTH_USER'], $server['PHP_AUTH_PW']);
+        return $parser->buildUserInfo(rawurlencode($server['PHP_AUTH_USER']), rawurlencode($server['PHP_AUTH_PW']));
     }
 
     /**

src/Types/ImmutableComponentTrait.php

@@ -96,13 +96,17 @@ protected static function encode($value)
             return preg_quote($value, '/');
         }, static::$characters_set));
 
-        return preg_replace_callback(
+        $str = preg_replace_callback(
             '/(?:[^'.$reservedChars.']+|%(?![A-Fa-f0-9]{2}))/',
             function (array $matches) {
                 return rawurlencode($matches[0]);
             },
             $value
         );
+
+        return preg_replace_callback(',(?<encode>%[0-9A-F]{2}),i', function (array $matches) {
+            return strtoupper($matches['encode']);
+        }, $str);
     }
 
     /**

src/Types/ImmutablePropertyTrait.php

@@ -55,7 +55,7 @@ protected function filterPropertyValue($value)
                 (is_object($value) ? get_class($value) : gettype($value))
             ));
         }
-        
+
         if ('' === $value) {
             return null;
         }

test/Schemes/HttpTest.php

@@ -122,6 +122,18 @@ public function validServerArray()
                     'HTTP_HOST' => 'localhost:23',
                 ],
             ],
+            'with user info and HTTP AUTHORIZATION' => [
+                'https://foo:bar@localhost:23',
+                [
+                    'PHP_SELF' => '',
+                    'REQUEST_URI' => '',
+                    'SERVER_ADDR' => '127.0.0.1',
+                    'HTTP_AUTHORIZATION' => 'basic '.base64_encode('foo:bar'),
+                    'HTTPS' => 'on',
+                    'SERVER_PORT' => 23,
+                    'HTTP_HOST' => 'localhost:23',
+                ],
+            ],
             'without request uri' => [
                 'https://127.0.0.1:23/toto?foo=bar',
                 [