Refactoring logic for exceptBodyParams and onlyBodyParams to use \arr…

…ay_filter by passing in ARRAY_FILTER_USE_KEY.

Adding hasUploadedFile method to ServerRequest along with test coverage.

src/ServerRequest.php

@@ -267,16 +267,11 @@ public function getBodyParam(string $param)
 	 */
 	public function onlyBodyParams(array $params): array
 	{
-		$only = [];
+		return \array_filter((array) $this->parsedBody, function($key) use ($params): bool {
 
-		foreach( (array) $this->parsedBody as $key => $value ){
+			return \in_array($key, $params);
 
-			if( \in_array($key, $params) ){
-				$only[$key] = $value;
-			}
-		}
-
-		return $only;
+		}, ARRAY_FILTER_USE_KEY);
 	}
 
 	/**
@@ -287,15 +282,11 @@ public function onlyBodyParams(array $params): array
 	 */
 	public function exceptBodyParams(array $params): array
 	{
-		$except = [];
+		return \array_filter((array) $this->parsedBody, function($key) use ($params): bool {
 
-		foreach( (array) $this->parsedBody as $key => $value ){
-			if( !\in_array($key, $params) ){
-				$except[$key] = $value;
-			}
-		}
+			return !\in_array($key, $params);
 
-		return $except;
+		}, ARRAY_FILTER_USE_KEY);
 	}
 
 	/**
@@ -333,6 +324,17 @@ public function getAllParams(): array
 		);
 	}
 
+	/**
+	 * Check for the presense of an uploaded file.
+	 *
+	 * @param string $name
+	 * @return boolean
+	 */
+	public function hasUploadedFile(string $name): bool
+	{
+		return \array_key_exists($name, $this->getUploadedFiles());
+	}
+
 	/**
 	 * Get an UploadedFileInterface instance by its name.
 	 *

tests/ServerRequestTest.php

@@ -413,6 +413,21 @@ public function test_except_body_params()
 		);
 	}
 
+	public function test_has_uploaded_file()
+	{
+		$request = $this->makeRequest();
+
+		$uploadedFile = new UploadedFile("Ok");
+
+		$request = $request->withUploadedFiles([
+			"file" => $uploadedFile
+		]);
+
+		$this->assertTrue(
+			$request->hasUploadedFile("file")
+		);
+	}
+
 	public function test_get_uploaded_file()
 	{
 		$request = $this->makeRequest();