webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Updated composer deps, applied latest StyleCI changes

Browse Source
This commit is contained in:
Dan Brown
2022-04-24 18:22:40 +01:00
parent 63cb6015a8
commit 2b0ae23da0
14 changed files with 182 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/AttachmentApiController.php
View File

@ -90,6 +90,7 @@ class AttachmentApiController extends ApiController
// Simply return a JSON response of the attachment for link-based attachments
if ($attachment->external) {
$attachment->setAttribute('content', $attachment->path);
return response()->json($attachment);
}

10
app/Http/Controllers/Controller.php
View File

@ -126,7 +126,7 @@ abstract class Controller extends BaseController
*/
protected function streamedDownloadResponse($stream, string $fileName): StreamedResponse
{
return response()->stream(function() use ($stream) {
return response()->stream(function () use ($stream) {
// End & flush the output buffer otherwise we still seem to use memory.
// Ignore in testing since output buffers are used to gather a response.
if (!app()->runningUnitTests()) {
@ -167,10 +167,10 @@ abstract class Controller extends BaseController
$sniffContent = fread($stream, 1000);
$mime = (new WebSafeMimeSniffer())->sniff($sniffContent);
return response()->stream(function() use ($sniffContent, $stream) {
echo $sniffContent;
fpassthru($stream);
fclose($stream);
return response()->stream(function () use ($sniffContent, $stream) {
echo $sniffContent;
fpassthru($stream);
fclose($stream);
}, 200, [
'Content-Type' => $mime,
'Content-Disposition' => 'inline; filename="' . str_replace('"', '', $fileName) . '"',

2
app/Http/Controllers/SettingController.php
View File

@ -19,7 +19,7 @@ class SettingController extends Controller
}
/**
* Handle requests to the settings index path
* Handle requests to the settings index path.
*/
public function index()
{