🚿

Author: codemasher

src/ServerUtil.php

@@ -11,10 +11,8 @@
 
 namespace chillerlan\HTTP\Utils;
 
-use Psr\Http\Message\{
-	ServerRequestFactoryInterface, ServerRequestInterface, StreamFactoryInterface,
-	UploadedFileFactoryInterface, UploadedFileInterface, UriFactoryInterface, UriInterface
-};
+use Psr\Http\Message\{ServerRequestFactoryInterface, ServerRequestInterface, StreamFactoryInterface, StreamInterface,
+	UploadedFileFactoryInterface, UploadedFileInterface, UriFactoryInterface, UriInterface};
 use InvalidArgumentException;
 use function array_keys, explode, function_exists, is_array, is_file, substr;
 
@@ -176,15 +174,22 @@ public function createUploadedFileFromSpec(array $value):UploadedFileInterface|a
 			return self::normalizeNestedFileSpec($value);
 		}
 
-		// not sure if dumb or genius
-		$stream = is_file($value['tmp_name'])
-			? $this->streamFactory->createStreamFromFile($value['tmp_name'])
-			: $this->streamFactory->createStream($value['tmp_name']); // @codeCoverageIgnore
+		$stream = $this->createStreamFromFile($value['tmp_name']);
 
 		return $this->uploadedFileFactory
 			->createUploadedFile($stream, (int)$value['size'], (int)$value['error'], $value['name'], $value['type']);
 	}
 
+	/** @codeCoverageIgnore */
+	private function createStreamFromFile(string $file):StreamInterface{
+
+		if(is_file($file)){
+			return $this->streamFactory->createStreamFromFile($file);
+		}
+
+		return $this->streamFactory->createStream($file);
+	}
+
 	/**
 	 * Normalizes an array of file specifications.
 	 *

src/UriUtil.php

@@ -131,7 +131,7 @@ public static function withQueryValue(UriInterface $uri, string $key, string|nul
 		$replaceQuery = ['=' => '%3D', '&' => '%26'];
 		$key          = strtr($key, $replaceQuery);
 
-		$result[] = $value !== null
+		$result[] = ($value !== null)
 			? $key.'='.strtr($value, $replaceQuery)
 			: $key;