1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-14 01:57:20 +01:00

Merge branch '3.0'

This commit is contained in:
terrafrost 2021-03-10 07:58:51 -06:00
commit 7b1b13edd5

View File

@ -37,9 +37,10 @@
namespace phpseclib3\Net; namespace phpseclib3\Net;
use ParagonIE\ConstantTime\Hex;
use phpseclib3\Exception\FileNotFoundException; use phpseclib3\Exception\FileNotFoundException;
use phpseclib3\Common\Functions\Strings; use phpseclib3\Common\Functions\Strings;
use phpseclib3\Crypt\Common\AsymmetricKey;
use phpseclib3\System\SSH\Agent;
/** /**
* Pure-PHP implementations of SFTP. * Pure-PHP implementations of SFTP.
@ -430,7 +431,7 @@ class SFTP extends SSH2
* Login * Login
* *
* @param string $username * @param string $username
* @param string[] ...$args * @param string|AsymmetricKey|array[]|Agent|null ...$args
* @throws \UnexpectedValueException on receipt of unexpected packets * @throws \UnexpectedValueException on receipt of unexpected packets
* @return bool * @return bool
* @access public * @access public
@ -2096,7 +2097,7 @@ class SFTP extends SSH2
* $offset and $length can be used to download files in chunks. * $offset and $length can be used to download files in chunks.
* *
* @param string $remote_file * @param string $remote_file
* @param string|bool|resource $local_file * @param string|bool|resource|callable $local_file
* @param int $offset * @param int $offset
* @param int $length * @param int $length
* @param callable|null $progressCallback * @param callable|null $progressCallback