octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-29 12:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2023-06-04 10:51:36 -05:00
commit 501c96c48c
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpseclib/Net/SFTP.php
View File

@ -2490,12 +2490,31 @@ class SFTP extends SSH2
return $this->get_stat_cache_prop($path, 'gid'); return $this->get_stat_cache_prop($path, 'gid');
} }
/**
* Recursively go through rawlist() output to get the total filesize
*/
private static function recursiveFilesize(array $files): int
{
$size = 0;
foreach ($files as $name => $file) {
if ($name == '.' || $name == '..') {
continue;
}
$size += is_array($file) ?
self::recursiveFilesize($file) :
$file->size;
}
return $size;
}
/** /**
* Gets file size * Gets file size
*/ */
public function filesize(string $path) public function filesize(string $path, bool $recursive = false)
{ {
return $this->get_stat_cache_prop($path, 'size'); return !$recursive || $this->filetype($path) != 'dir' ?
$this->get_stat_cache_prop($path, 'size') :
$this->recursiveFilesize($this->rawlist($path, true));
} }
/** /**

2
tests/Unit/Crypt/RSA/ModeTest.php
View File

@ -257,7 +257,7 @@ zUlir0ACPypC1Q==
$this->assertSame($data, $decrypted); $this->assertSame($data, $decrypted);
} }
public function testSettingOnePadding() public function testSettingOnePadding(): void
{ {
$pub = <<<HERE $pub = <<<HERE
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----