From 3f18f628c8b978b0656ae39c7e01623e29e1f9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr> Date: Thu, 19 Oct 2017 18:38:42 +0200 Subject: [PATCH] =?UTF-8?q?Suppression=20de=20m=C3=A9thodes=20d'UploadedFi?= =?UTF-8?q?le=20qui=20ne=20servent=20plus.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Entity/UploadedFile.php | 63 ++++------------------------------------- 1 file changed, 5 insertions(+), 58 deletions(-) diff --git a/Entity/UploadedFile.php b/Entity/UploadedFile.php index ce92cb9b..d8e78b4c 100644 --- a/Entity/UploadedFile.php +++ b/Entity/UploadedFile.php @@ -446,15 +446,15 @@ class UploadedFile implements UploadedFileInterface if (false !== $fileHandle = $stream->cast(STREAM_CAST_AS_STREAM)) { // Utilise stream_copy_to_stream si le Gaufrette\Stream peut nous retourner un filehandle - $copied = $this->stream_copy_to_stream($source, $fileHandle, $maxlen); + $copied = stream_copy_to_stream($source, $fileHandle, $maxlen); } else { // Sinon fait une copie par blocs (moins performant) if ($maxlen === -1) { $maxlen = PHP_INT_MAX; } $copied = 0; - while (!$this->feof($source) && $copied <= $maxlen) { - $copied += $stream->write($this->fread($source, min(static::$copyBlockSize, $maxlen - $copied))); + while (!feof($source) && $copied <= $maxlen) { + $copied += $stream->write(fread($source, min(static::$copyBlockSize, $maxlen - $copied))); } } $stream->close(); @@ -483,12 +483,12 @@ class UploadedFile implements UploadedFileInterface 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); + $copied = stream_copy_to_stream($fileHandle, $dest, $actualLength); } else { // Sinon, on fait ça à la main par blocs de 8ko $copied = 0; while (!$stream->eof() && $copied < $actualLength) { - $copied += $this->fwrite($dest, $stream->read(min(static::$copyBlockSize, $actualLength - $copied))); + $copied += fwrite($dest, $stream->read(min(static::$copyBlockSize, $actualLength - $copied))); } } @@ -497,59 +497,6 @@ class UploadedFile implements UploadedFileInterface return $copied; } - /** Wrapper de stream_copy_to_stream - * @param resource $source - * @param resource $dest - * @param int $maxlen - * @param int $offset - * - * @return int - * - * @internal - */ - protected function stream_copy_to_stream($source, $dest, $maxlen = -1, $offset = 0) - { - return stream_copy_to_stream($source, $dest, $maxlen, $offset); - } - - /** Wrapper de feof - * @param resource $filehandle - * - * @return bool - * - * @internal - */ - protected function feof($filehandle) - { - return feof($filehandle); - } - - /** Wrapper de fread - * @param resource $filehandle - * @param int $maxlen - * - * @return int|bool - * - * @internal - */ - protected function fread($filehandle, $maxlen = -1) - { - return fread($filehandle, $maxlen); - } - - /** Wrapper de fwrite - * @param resource $filehandle - * @param int $maxlen - * - * @return int|bool - * - * @internal - */ - protected function fwrite($filehandle, $maxlen = -1) - { - return fwrite($filehandle, $maxlen); - } - /** Vérifie si un chemin est "safe". * @param string $path * -- GitLab