feature: make getFile consistently nullable

closes #287
PhpGt · Apr 25, 2024 · d8d33ff · d8d33ff
1 parent 7e82009
commit d8d33ff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/InputValueGetter.php b/src/InputValueGetter.php
@@ -69,14 +69,18 @@ public function getMultipleBool(string $key):array {
 	}
 
 
-	public function getFile(string $key):FileUpload {
+	public function getFile(string $key):?FileUpload {
 		/** @var FileUploadInputData|InputDatum[] $params */
 		$params = $this->fileUploadParameters ?? $this->parameters;
 
-		try {
-			/** @var MultipleInputDatum|FileUpload $file */
-			$file = $params[$key];
+		/** @var MultipleInputDatum|FileUpload|null $file */
+		$file = $params[$key] ?? null;
 
+		if(is_null($file)) {
+			return null;
+		}
+
+		try {
 			if($file instanceof MultipleInputDatum) {
 				return $file->current();
 			}

diff --git a/test/phpunit/InputTest.php b/test/phpunit/InputTest.php
@@ -121,6 +121,12 @@ public function testGetFileFieldSingle(array $get, array $post):void {
 		);
 	}
 
+	public function testGetFile_null():void {
+		$input = new Input([], [], []);
+		$file = $input->getFile("exampleFile");
+		self::assertNull($file);
+	}
+
 	/** @dataProvider dataRandomGetPost */
 	public function testGetInvalidDataType(array $get, array $post):void {
 		self::expectException(InvalidInputMethodException::class);