From 9b838cedd14cca454279ec2c08b89f99e97999ed Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 8 Jul 2024 22:00:45 +0100 Subject: [PATCH 1/2] Fixed typehint on asset model files Signed-off-by: snipe --- app/Http/Controllers/AssetModelsFilesController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AssetModelsFilesController.php b/app/Http/Controllers/AssetModelsFilesController.php index 5c21954d6d..c905282cc5 100644 --- a/app/Http/Controllers/AssetModelsFilesController.php +++ b/app/Http/Controllers/AssetModelsFilesController.php @@ -10,6 +10,7 @@ use Illuminate\Http\RedirectResponse; use Illuminate\Http\Response; use Illuminate\Support\Facades\Storage; use \Symfony\Component\HttpFoundation\StreamedResponse; +use Symfony\Component\HttpFoundation\BinaryFileResponse; class AssetModelsFilesController extends Controller { @@ -57,7 +58,7 @@ class AssetModelsFilesController extends Controller * @param int $fileId * @since [v1.0] */ - public function show($modelId = null, $fileId = null) : StreamedResponse | Response | RedirectResponse + public function show($modelId = null, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse { $model = AssetModel::find($modelId); // the asset is valid From bf060d43a7ac3810b314908ba4aaa486fd3b29b0 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 8 Jul 2024 22:02:11 +0100 Subject: [PATCH 2/2] Fixed typehint on assets controller Signed-off-by: snipe --- app/Http/Controllers/Assets/AssetsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 9a91cc5602..331bd07125 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -29,6 +29,7 @@ use League\Csv\Reader; use Illuminate\Http\Response; use Illuminate\Contracts\View\View; use Illuminate\Http\RedirectResponse; +use Symfony\Component\HttpFoundation\BinaryFileResponse; /** * This class controls all actions related to assets for @@ -474,7 +475,7 @@ class AssetsController extends Controller * @param int $assetId * @since [v1.0] */ - public function getQrCode($assetId = null) : Response + public function getQrCode($assetId = null) : Response | BinaryFileResponse { $settings = Setting::getSettings();