Merge branch '3.0'

This commit is contained in:
terrafrost 2021-04-12 08:23:56 -05:00
commit a9aa3b117d
3 changed files with 7 additions and 4 deletions

View File

@ -351,6 +351,9 @@ abstract class AsymmetricKey
continue;
}
$name = $file->getBasename('.php');
if ($name[0] == '.') {
continue;
}
$type = 'phpseclib3\Crypt\\' . static::ALGORITHM . '\\Formats\\' . $format . '\\' . $name;
$reflect = new \ReflectionClass($type);
if ($reflect->isTrait()) {

View File

@ -272,7 +272,7 @@ class SFTP extends SSH2
* @var array
* @access private
*/
var $requestBuffer = array();
private $requestBuffer = array();
/**
* Preserve timestamps on file downloads / uploads
@ -282,7 +282,7 @@ class SFTP extends SSH2
* @var bool
* @access private
*/
var $preserveTime = false;
private $preserveTime = false;
/**
* Default Constructor.

View File

@ -640,7 +640,7 @@ class SSH2
* @see self::exec()
* @access private
*/
var $window_resize = 0x40000000;
private $window_resize = 0x40000000;
/**
* Window size, server to client
@ -729,7 +729,7 @@ class SSH2
* @see self::setKeepAlive()
* @access private
*/
var $keepAlive;
private $keepAlive;
/**
* Real-time log file pointer