From 470b11eeee82946fbf93d5944c63749bcdf65f6f Mon Sep 17 00:00:00 2001 From: David Greminger Date: Thu, 4 Apr 2024 08:57:10 +0200 Subject: [PATCH] Widen typehint (#445) --- src/Controller/AbstractController.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/Controller/AbstractController.php b/src/Controller/AbstractController.php index 7dbd5b6..1e1a867 100644 --- a/src/Controller/AbstractController.php +++ b/src/Controller/AbstractController.php @@ -100,10 +100,8 @@ protected function getFiles(FileBag $bag): array * function in the implemented Controller. * * Note: The return value differs when - * - * @param File $file The file to upload */ - protected function handleUpload(File $file, ResponseInterface $response, Request $request): void + protected function handleUpload(FileInterface|File $file, ResponseInterface $response, Request $request): void { // wrap the file if it is not done yet which can only happen // if it wasn't a chunked upload, in which case it is definitely @@ -130,12 +128,8 @@ protected function handleUpload(File $file, ResponseInterface $response, Request /** * This function is a helper function which dispatches pre upload event. - * - * @param FileInterface $uploaded the uploaded file - * @param ResponseInterface $response a response object - * @param Request $request the request object */ - protected function dispatchPreUploadEvent(FileInterface $uploaded, ResponseInterface $response, Request $request): void + protected function dispatchPreUploadEvent(FileInterface|File $uploaded, ResponseInterface $response, Request $request): void { // dispatch pre upload event (both the specific and the general) $preUploadEvent = new PreUploadEvent($uploaded, $response, $request, $this->type, $this->config); @@ -146,10 +140,8 @@ protected function dispatchPreUploadEvent(FileInterface $uploaded, ResponseInter /** * This function is a helper function which dispatches post upload * and post persist events. - * - * @param File $uploaded the uploaded file */ - protected function dispatchPostEvents(File $uploaded, ResponseInterface $response, Request $request): void + protected function dispatchPostEvents(FileInterface|File $uploaded, ResponseInterface $response, Request $request): void { // dispatch post upload event (both the specific and the general) $postUploadEvent = new PostUploadEvent($uploaded, $response, $request, $this->type, $this->config); @@ -164,7 +156,7 @@ protected function dispatchPostEvents(File $uploaded, ResponseInterface $respons } } - protected function validate(FileInterface $file, Request $request, ?ResponseInterface $response = null): void + protected function validate(FileInterface|File $file, Request $request, ?ResponseInterface $response = null): void { $event = new ValidationEvent($file, $request, $this->config, $this->type, $response);