Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/DefaultLogWriter.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Spatie\HttpLogger;

use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Symfony\Component\HttpFoundation\File\UploadedFile;

Expand All @@ -16,12 +17,24 @@ public function logRequest(Request $request)

$bodyAsJson = json_encode($request->except(config('http-logger.except')));

$files = array_map(function (UploadedFile $file) {
return $file->getClientOriginalName();
}, iterator_to_array($request->files));

$message = "{$method} {$uri} - Body: {$bodyAsJson} - Files: ".implode(', ', $files);
$files = (new Collection(iterator_to_array($request->files)))
->map([$this, 'flatFiles'])
->flatten()
->implode(',')
;
$message = "{$method} {$uri} - Body: {$bodyAsJson} - Files: ". $files;

Log::info($message);
}

public function flatFiles($file)
{
if ($file instanceof UploadedFile) {
return $file->getClientOriginalName();
}
if (is_array($file)) {
return array_map([$this, 'flatFiles'], $file);
}
return (string) $file;
}
}
18 changes: 18 additions & 0 deletions tests/DefaultLogWriterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,22 @@ public function it_logs_files()

$this->assertStringContainsString('test.md', $log);
}

/** @test */
public function it_logs_files_in_an_array()
{
$file = $this->getTempFile();

$request = $this->makeRequest('post', $this->uri, [], [], [
'files' => [
new UploadedFile($file, 'test.md')
],
]);

$this->logger->logRequest($request);

$log = $this->readLogFile();

$this->assertStringContainsString('test.md', $log);
}
}