Implement and test body get/with functions

Author: Greg Bowler

src/ServerRequest.php

@@ -6,6 +6,8 @@
 use Gt\Http\Header\RequestHeaders;
 use Gt\Input\Input;
 use Gt\Input\InputData\Datum\FileUpload;
+use Gt\Input\InputData\Datum\InputDatum;
+use Gt\Input\InputData\InputData;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UploadedFileInterface;
 
@@ -152,30 +154,15 @@ public function getUploadedFiles():array {
 	 * immutability of the message, and MUST return an instance that has the
 	 * updated body parameters.
 	 *
-	 * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
+	 * @param FileUpload[] $uploadedFiles An array tree of UploadedFileInterface instances.
 	 * @return static
 	 * @throws \InvalidArgumentException if an invalid structure is provided.
 	 */
 	public function withUploadedFiles(array $uploadedFiles):self {
-		$clone = clone $this;
-
-		$fileUploadParameters = $clone->input->getAll(
+		return $this->withInputData(
+			$uploadedFiles,
 			Input::DATA_FILES
 		);
-		$fileUploadParameters->remove(
-			...$fileUploadParameters->getKeys()
-		);
-
-		/** @var FileUpload[] $uploadedFiles */
-		foreach($uploadedFiles as $key => $file) {
-			$clone->input->add(
-				$key,
-				$file,
-				Input::DATA_FILES
-			);
-		}
-
-		return $clone;
 	}
 
 	/**
@@ -194,7 +181,7 @@ public function withUploadedFiles(array $uploadedFiles):self {
 	 *     These will typically be an array or object.
 	 */
 	public function getParsedBody() {
-// TODO: Implement getParsedBody() method.
+		return $this->input->getAll(Input::DATA_BODY);
 	}
 
 	/**
@@ -219,14 +206,17 @@ public function getParsedBody() {
 	 * immutability of the message, and MUST return an instance that has the
 	 * updated body parameters.
 	 *
-	 * @param null|array|object $data The deserialized body data. This will
+	 * @param InputDatum[] $inputDatumArray The deserialized body data. This will
 	 *     typically be in an array or object.
 	 * @return static
 	 * @throws \InvalidArgumentException if an unsupported argument type is
 	 *     provided.
 	 */
-	public function withParsedBody($data):self {
-// TODO: Implement withParsedBody() method.
+	public function withParsedBody($inputDatumArray):self {
+		return $this->withInputData(
+			$inputDatumArray,
+			Input::DATA_BODY
+		);
 	}
 
 	/**
@@ -303,4 +293,29 @@ public function withoutAttribute($name):self {
 		unset($clone->attributes[$name]);
 		return $clone;
 	}
+
+	protected function withInputData(
+		array $inputDatumArray,
+		string $method
+	):self {
+		$clone = clone $this;
+
+		$parameters = $clone->input->getAll(
+			$method
+		);
+		$parameters->remove(
+			...$parameters->getKeys()
+		);
+
+		/** @var InputDatum[] $inputDatumArray */
+		foreach($inputDatumArray as $key => $datum) {
+			$clone->input->add(
+				$key,
+				$datum,
+				$method
+			);
+		}
+
+		return $clone;
+	}
 }

test/unit/ServerRequestTest.php

@@ -8,9 +8,11 @@
 use Gt\Http\ServerRequest;
 use Gt\Http\Uri;
 use Gt\Input\Input;
+use Gt\Input\InputData\BodyInputData;
 use Gt\Input\InputData\Datum\FileUpload;
 use Gt\Input\InputData\Datum\InputDatum;
 use Gt\Input\InputData\FileUploadInputData;
+use Gt\Input\InputData\InputData;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -174,6 +176,47 @@ public function testWithUploadedFilesEmptyToFull() {
 		self::assertCount(2, $sutFull->getUploadedFiles());
 	}
 
+	public function testGetParsedBodyEmpty() {
+		$sut = self::getServerRequest(
+			"get",
+			"/example"
+		);
+		self::assertEmpty($sut->getParsedBody());
+	}
+
+	public function testGetParsedBody() {
+		$sut = self::getServerRequest(
+			"post",
+			"/example",
+			[],
+			[],
+			[
+				"post" => [
+					"key1" => "value1",
+					"key2" => "value2",
+				]
+			]
+		);
+
+		/** @var InputData $inputData */
+		$inputData = $sut->getParsedBody();
+		self::assertInstanceOf(InputData::class, $inputData);
+		self::assertCount(2, $inputData->asArray());
+	}
+
+	public function testWithParsedBody() {
+		$sut = self::getServerRequest();
+		$inputData = $sut->getParsedBody();
+		self::assertEmpty($inputData->asArray());
+
+		$inputDatumArray = [];
+		$inputDatumArray []= self::createMock(InputDatum::class);
+		$inputDatumArray []= self::createMock(InputDatum::class);
+
+		$sut = $sut->withParsedBody($inputDatumArray);
+		self::assertCount(2, $sut->getParsedBody()->asArray());
+	}
+
 	protected function getServerRequest(
 		string $method = null,
 		string $uri = null,
@@ -243,9 +286,19 @@ protected function getMockInput(
 		array $post = [],
 		array $files = []
 	):MockObject {
+		$bodyArray = [];
+		foreach($post as $key => $value) {
+			$bodyArray []= self::createMock(InputDatum::class);
+		}
+		$bodyParameters = self::createMock(BodyInputData::class);
+		$bodyParameters->method("asArray")
+			->willReturnCallback(function()use(&$bodyArray) {
+				return $bodyArray;
+			});
+
 		$fileArray = [];
 		foreach($files as $file) {
-			$fileArray []= $this->createMock(FileUpload::class);
+			$fileArray []= self::createMock(FileUpload::class);
 		}
 		$fileUploadParameters = self::createMock(FileUploadInputData::class);
 		$fileUploadParameters->method("getKeys")
@@ -266,16 +319,26 @@ protected function getMockInput(
 
 		$mock = self::createMock(Input::class);
 		$mock->method("getAll")
-			->with(Input::DATA_FILES)
-			->willReturn($fileUploadParameters);
+			->willReturnCallback(function($method)use($bodyParameters, $fileUploadParameters) {
+				if($method === Input::DATA_FILES) {
+					return $fileUploadParameters;
+				}
+				if($method === Input::DATA_BODY) {
+					return $bodyParameters;
+				}
+			});
 		$mock->method("add")
-			->willReturnCallback(function(string $key, InputDatum $datum, string $method)use(&$fileArray) {
+			->willReturnCallback(function(string $key, InputDatum $datum, string $method)use(&$bodyArray, &$fileArray) {
 				if($method === Input::DATA_FILES) {
 					/** @var FileUpload $datum */
 					$fileArray[$key] = [
 						"name" => $datum->getClientFilename()
 					];
 				}
+				if($method === INPUT::DATA_BODY) {
+					/** @var InputDatum $datum */
+					$bodyArray[$key] = $datum;
+				}
 			});
 		return $mock;
 	}