X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ae155d67454d6b9f6c93b2bb457aaa4b2eb1a9ed..refs/pull/3043/head:/app/Http/Controllers/Controller.php diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 3bccdcda4..047e0bed9 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -6,7 +6,6 @@ use BookStack\Facades\Activity; use BookStack\Interfaces\Loggable; use BookStack\Model; use BookStack\Util\WebSafeMimeSniffer; -use finfo; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Http\Exceptions\HttpResponseException; @@ -130,8 +129,7 @@ abstract class Controller extends BaseController */ protected function inlineDownloadResponse(string $content, string $fileName): Response { - - $mime = (new WebSafeMimeSniffer)->sniff($content); + $mime = (new WebSafeMimeSniffer())->sniff($content); return response()->make($content, 200, [ 'Content-Type' => $mime, @@ -167,7 +165,7 @@ abstract class Controller extends BaseController /** * Log an activity in the system. * - * @param string|Loggable + * @param $detail string|Loggable */ protected function logActivity(string $type, $detail = ''): void { @@ -177,8 +175,8 @@ abstract class Controller extends BaseController /** * Get the validation rules for image files. */ - protected function getImageValidationRules(): string + protected function getImageValidationRules(): array { - return 'image_extension|mimes:jpeg,png,gif,webp'; + return ['image_extension', 'mimes:jpeg,png,gif,webp']; } }