🚿

Author: codemasher

src/Query.php

@@ -10,8 +10,8 @@
 
 namespace chillerlan\HTTP\Utils;
 
-use function array_merge, explode, implode, is_array, is_bool, is_string, parse_url, rawurldecode, sort, str_replace, uksort;
-use const PHP_QUERY_RFC1738, PHP_QUERY_RFC3986, PHP_URL_QUERY, SORT_STRING;
+use function array_merge, explode, implode, is_array, is_bool, is_string, rawurldecode, sort, str_replace, uksort;
+use const PHP_QUERY_RFC1738, PHP_QUERY_RFC3986, SORT_STRING;
 
 /**
  *
@@ -166,7 +166,7 @@ public static function build(array $params, int $encoding = null, string $delimi
 	 * @return string
 	 */
 	public static function merge(string $uri, array $query):string{
-		$parsedquery = self::parse(parse_url($uri, PHP_URL_QUERY) ?: '');
+		$parsedquery = self::parse(parseUrl($uri)['query'] ?? '');
 		$requestURI  = explode('?', $uri)[0];
 		$params      = array_merge($parsedquery, $query);
 

src/Server.php

@@ -82,15 +82,16 @@ public function createUriFromGlobals():UriInterface{
 
 		$uri = $this->uriFactory
 			->createUri()
-			->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http');
+			->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http')
+		;
 
 		if(isset($_SERVER['HTTP_HOST'])){
 			$hostHeaderParts = explode(':', $_SERVER['HTTP_HOST']);
-			$uri = $uri->withHost($hostHeaderParts[0]);
+			$uri             = $uri->withHost($hostHeaderParts[0]);
 
 			if(isset($hostHeaderParts[1])){
-				$hasPort       = true;
-				$uri = $uri->withPort((int)$hostHeaderParts[1]);
+				$hasPort = true;
+				$uri     = $uri->withPort((int)$hostHeaderParts[1]);
 			}
 		}
 		elseif(isset($_SERVER['SERVER_NAME'])){
@@ -106,11 +107,11 @@ public function createUriFromGlobals():UriInterface{
 
 		if(isset($_SERVER['REQUEST_URI'])){
 			$requestUriParts = explode('?', $_SERVER['REQUEST_URI']);
-			$uri = $uri->withPath($requestUriParts[0]);
+			$uri             = $uri->withPath($requestUriParts[0]);
 
 			if(isset($requestUriParts[1])){
-				$hasQuery       = true;
-				$uri = $uri->withQuery($requestUriParts[1]);
+				$hasQuery = true;
+				$uri      = $uri->withQuery($requestUriParts[1]);
 			}
 		}
 
@@ -207,5 +208,4 @@ public function normalizeNestedFileSpec(array $files):array{
 		return $normalized;
 	}
 
-
 }

src/message_helpers.php

@@ -165,7 +165,7 @@ function r_rawurlencode($data){
  * @return \stdClass|array|bool
  */
 function get_json(MessageInterface $message, bool $assoc = null){
-	$data = json_decode($message->getBody()->__toString(), $assoc);
+	$data = json_decode((string)$message->getBody(), $assoc);
 
 	$message->getBody()->rewind();
 
@@ -179,7 +179,7 @@ function get_json(MessageInterface $message, bool $assoc = null){
  * @return \SimpleXMLElement|array|bool
  */
 function get_xml(MessageInterface $message, bool $assoc = null){
-	$data = simplexml_load_string($message->getBody()->__toString());
+	$data = simplexml_load_string((string)$message->getBody());
 
 	$message->getBody()->rewind();
 
@@ -214,7 +214,7 @@ function message_to_string(MessageInterface $message):string{
 		$msg .= "\r\n".$name.': '.implode(', ', $values);
 	}
 
-	$data = $message->getBody()->__toString();
+	$data = (string)$message->getBody();
 	$message->getBody()->rewind();
 
 	return $msg."\r\n\r\n".$data;

tests/MessageHelpersTest.php

@@ -49,10 +49,9 @@ public function testRawurlencode($data, $expected):void{
 	}
 
 	public function testRawurlencodeTypeErrorException():void{
-		$this::expectException(TypeError::class);
+		$this->expectException(TypeError::class);
 
-		/** @noinspection PhpParamsInspection */
-		r_rawurlencode(new \stdClass());
+		r_rawurlencode((object)[]);
 	}
 
 	public function testGetJSON():void{