From da94a7d5b833e757ec376fdf52300af7176272cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Fri, 30 Jan 2015 10:17:17 +0100
Subject: [PATCH] Correction d'un gros bug dans UploadedFile->copyTo.
---
Entity/UploadedFile.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Entity/UploadedFile.php b/Entity/UploadedFile.php
index 9002066c..452c6e52 100644
--- a/Entity/UploadedFile.php
+++ b/Entity/UploadedFile.php
@@ -472,7 +472,7 @@ class UploadedFile implements UploadedFileInterface
* @param int $readOffset
* @return int
*/
- public function copyTo($dest, $maxlen = PHP_INT_MAX, $readOffset = 0)
+ public function copyTo($dest, $maxlen = -1, $readOffset = 0)
{
if($maxlen === -1) {
$actualLength = $this->getSize() - $readOffset;
@@ -480,7 +480,7 @@ class UploadedFile implements UploadedFileInterface
$actualLength = min($maxlen, $this->getSize() - $readOffset);
}
- if (0 <= $actualLength) {
+ if ($actualLength <= 0) {
return 0;
}
@@ -488,6 +488,7 @@ class UploadedFile implements UploadedFileInterface
$stream->open(new StreamMode('rb'));
$stream->seek($readOffset);
+
if(false !== $fileHandle = $stream->cast(STREAM_CAST_AS_STREAM)) {
// Utilise stream_copy_to_stream si le Stream nous renvoie un filehandle
$copied = $this->stream_copy_to_stream($fileHandle, $dest, $actualLength);
--
GitLab