Skip to content

Attempt to fix error when submitting empty file input #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 24, 2018
Merged

Attempt to fix error when submitting empty file input #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81bd0b1
Attempt to fix error when submitting empty file input
benjaminjonard Jan 17, 2018
f25848a
Fix changes requested
benjaminjonard Jan 18, 2018
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
35 changes: 22 additions & 13 deletions Bridges/HttpKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@
use PHPPM\Utils;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\UploadedFileInterface;
use RingCentral\Psr7;
use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyFile;
use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
use Symfony\Component\HttpFoundation\StreamedResponse as SymfonyStreamedResponse;
use Symfony\Component\HttpKernel\TerminableInterface;


class HttpKernel implements BridgeInterface
{
/**
Expand Down Expand Up @@ -152,22 +155,28 @@ protected function mapRequest(ServerRequestInterface $psrRequest)
$uploadedFiles = $psrRequest->getUploadedFiles();

$mapFiles = function(&$files) use (&$mapFiles) {
foreach ($files as &$value) {
if (is_array($value)) {
$mapFiles($value);
} else if ($value instanceof \React\Http\Io\UploadedFile) {
foreach ($files as &$file) {
if (is_array($file)) {
$mapFiles($file);
} else if ($file instanceof UploadedFileInterface) {
$tmpname = tempnam(sys_get_temp_dir(), 'upload');
$this->tempFiles[] = $tmpname;

file_put_contents($tmpname, (string)$value->getStream());
$value = new \Symfony\Component\HttpFoundation\File\UploadedFile(
$tmpname,
$value->getClientFilename(),
$value->getClientMediaType(),
$value->getSize(),
$value->getError(),
true
);
if (UPLOAD_ERR_NO_FILE == $file->getError()) {
$file = null;
} else {
if (UPLOAD_ERR_OK == $file->getError()) {
file_put_contents($tmpname, (string)$file->getStream());
}
$file = new SymfonyFile(
$tmpname,
$file->getClientFilename(),
$file->getClientMediaType(),
$file->getSize(),
$file->getError(),
true
);
}
}
}
};
Expand Down