🚿

Author: codemasher

src/Psr7/Uri.php

@@ -192,7 +192,7 @@ public function getAuthority():string{
 	 * @inheritDoc
 	 */
 	public function getUserInfo():string{
-		return (string)$this->user.($this->pass != '' ? ':'.$this->pass : '');
+		return $this->user.($this->pass != '' ? ':'.$this->pass : '');
 	}
 
 	/**
@@ -283,6 +283,7 @@ protected function filterPort($port):?int{
 		}
 
 		$port = (int)$port;
+
 		if($port >= 1 && $port <= 0xffff){
 			return $port;
 		}
@@ -468,12 +469,10 @@ protected function parseUriParts(array $parts):void{
 	 * @return string
 	 */
 	protected function replaceChars(string $str, bool $query = null):string{
-		/** @noinspection RegExpRedundantEscape */
+		/** @noinspection RegExpRedundantEscape, RegExpUnnecessaryNonCapturingGroup */
 		return preg_replace_callback(
 			'/(?:[^a-z\d_\-\.~!\$&\'\(\)\*\+,;=%:@\/'.($query ? '\?' : '').']++|%(?![a-f\d]{2}))/i',
-			function(array $match):string{
-				return rawurlencode($match[0]);
-			},
+			fn(array $match):string => rawurlencode($match[0]),
 			$str
 		);