Skip to content

Do not check streams with is_writable in UploadedFile::moveTo() #1925

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
Jul 6, 2016
Merged

Do not check streams with is_writable in UploadedFile::moveTo() #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
157e16b
Do not check streams with is_writable in UploadedFile::moveTo()
opengeek Jul 1, 2016
5ad0116
Remove expectedException from test written for this bug
opengeek Jul 5, 2016
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
4 changes: 2 additions & 2 deletions Slim/Http/UploadedFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@ public function moveTo($targetPath)
throw new RuntimeException('Uploaded file already moved');
}

if (!is_writable(dirname($targetPath))) {
$targetIsStream = strpos($targetPath, '://') > 0;
if (!$targetIsStream && !is_writable(dirname($targetPath))) {
throw new InvalidArgumentException('Upload target path is not writable');
}

$targetIsStream = strpos($targetPath, '://') > 0;
if ($targetIsStream) {
if (!copy($this->file, $targetPath)) {
throw new RuntimeException(sprintf('Error moving uploaded file %1s to %2s', $this->name, $targetPath));
Expand Down
3 changes: 0 additions & 3 deletions tests/Http/UploadedFilesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@ public function testMovedStream($uploadedFile)
$uploadedFile->getStream();
}

/**
* @expectedException \InvalidArgumentException
*/
public function testMoveToStream()
{
$uploadedFile = $this->generateNewTmpFile();
Expand Down