Merge e03b42a into bc6f29e

slimphp · Mar 4, 2022 · 50c3f3d · 50c3f3d
2 parents bc6f29e + e03b42a
commit 50c3f3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/Factory/UriFactory.php b/src/Factory/UriFactory.php
@@ -94,10 +94,7 @@ public function createFromGlobals(array $globals): Uri
         }
 
         // Query string
-        $queryString = '';
-        if (isset($globals['QUERY_STRING'])) {
-            $queryString = $globals['QUERY_STRING'];
-        }
+        $queryString = $globals['QUERY_STRING'] ?? '';
 
         // Request URI
         $requestUri = '';

diff --git a/src/Uri.php b/src/Uri.php
@@ -87,8 +87,8 @@ public function __construct(
         $this->path = $this->filterPath($path);
         $this->query = $this->filterQuery($query);
         $this->fragment = $this->filterFragment($fragment);
-        $this->user = $user;
-        $this->password = $password;
+        $this->user = $this->filterUserInfo($user);
+        $this->password = $this->filterUserInfo($password);
     }
 
     /**

diff --git a/tests/Factory/UriFactoryTest.php b/tests/Factory/UriFactoryTest.php
@@ -53,7 +53,7 @@ public function testGetUserInfoWithUsernameAndPasswordEncodesCorrectly()
     {
         $uri = $this
             ->createUriFactory()
-            ->createUri('https://bob%40example.com:pass%3Aword@example.com:443/foo/bar?abc=123#section3');
+            ->createUri('https://bob@example.com:pass:word@example.com:443/foo/bar?abc=123#section3');
 
         $this->assertEquals('bob%40example.com:pass%3Aword', $uri->getUserInfo());
     }