🚿

Author: codemasher

src/Psr17/factory_helpers.php

@@ -29,7 +29,7 @@
 function create_server_request_from_globals():ServerRequest{
 
 	$serverRequest = new ServerRequest(
-		isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : ServerRequest::METHOD_GET,
+		$_SERVER['REQUEST_METHOD'] ?? ServerRequest::METHOD_GET,
 		create_uri_from_globals(),
 		\function_exists('getallheaders') ? \getallheaders() : [],
 		(new StreamFactory)->createStream(),

src/Psr18/HTTPClientAbstract.php

@@ -66,9 +66,9 @@ public function __construct(
 	 * @return \Psr\Http\Message\ResponseInterface
 	 */
 	public function request(string $uri, string $method = null, array $query = null, $body = null, array $headers = null):ResponseInterface{
-		$method    = \strtoupper($method ?? 'GET');
-		$headers   = Psr7\normalize_request_headers($headers);
-		$request   = new Request($method, Psr7\merge_query($uri, $query ?? []));
+		$method  = \strtoupper($method ?? 'GET');
+		$headers = Psr7\normalize_request_headers($headers);
+		$request = new Request($method, Psr7\merge_query($uri, $query ?? []));
 
 		if(\in_array($method, ['DELETE', 'PATCH', 'POST', 'PUT'], true) && $body !== null){
 

src/Psr7/Request.php

@@ -46,7 +46,7 @@ public function __construct(string $method, $uri, array $headers = null, $body =
 		parent::__construct($headers, $body, $version);
 
 		$this->method = \strtoupper($method);
-		$this->uri    = !$uri instanceof UriInterface ? new Uri($uri) : $uri;
+		$this->uri    = $uri instanceof UriInterface ? $uri : new Uri($uri);
 
 		if(!$this->hasHeader('Host')){
 			$this->updateHostFromUri();

src/Psr7/ServerRequest.php

@@ -51,7 +51,7 @@ final class ServerRequest extends Request implements ServerRequestInterface{
 	 * ServerRequest constructor.
 	 *
 	 * @param string                                                 $method
-	 * @param                                                        $uri
+	 * @param string|\Psr\Http\Message\UriInterface                  $uri
 	 * @param array|null                                             $headers
 	 * @param null|string|resource|\Psr\Http\Message\StreamInterface $body
 	 * @param string|null                                            $version

src/Psr7/Stream.php

@@ -85,6 +85,7 @@ public function __toString(){
 		// @codeCoverageIgnoreStart
 		catch(Exception $e){
 			// https://bugs.php.net/bug.php?id=53648
+			// @todo: fixed in 7.4
 			\trigger_error('Stream::__toString exception: '.$e->getMessage(), \E_USER_ERROR);
 
 			return '';
@@ -240,6 +241,7 @@ public function read($length):string{
 		if(!$this->readable){
 			throw new RuntimeException('Cannot read from non-readable stream');
 		}
+
 		if($length < 0){
 			throw new RuntimeException('Length parameter cannot be negative');
 		}

src/Psr7/Uri.php

@@ -501,11 +501,7 @@ protected function parseUriParts(array $parts):void{
 	 */
 	protected function replaceChars(string $str, bool $query = null):string{
 		return \preg_replace_callback(
-			'/(?:[^'
-			.'a-z\d_\-\.~'
-			.'!\$&\'\(\)\*\+,;='
-			.'%:@\/'.($query ? '\?' : '')
-			.']++|%(?![a-f\d]{2}))/i',
+			'/(?:[^a-z\d_\-\.~!\$&\'\(\)\*\+,;=%:@\/'.($query ? '\?' : '').']++|%(?![a-f\d]{2}))/i',
 			function(array $match):string{
 				return \rawurlencode($match[0]);
 			},