Skip to content

Commit

Permalink
Merge branch '3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
terrafrost committed Feb 8, 2024
2 parents e47383e + 8f3a665 commit 4427f40
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions phpseclib/Net/SFTP.php
Original file line number Diff line number Diff line change
Expand Up @@ -3064,15 +3064,15 @@ public function getSFTPLog()
}

/**
* Returns all errors
* Returns all errors on the SFTP layer
*/
public function getSFTPErrors(): array
{
return $this->sftp_errors;
}

/**
* Returns the last error
* Returns the last error on the SFTP layer
*/
public function getLastSFTPError(): string
{
Expand Down
8 changes: 6 additions & 2 deletions phpseclib/Net/SSH2.php
Original file line number Diff line number Diff line change
Expand Up @@ -4334,7 +4334,9 @@ private static function array_intersect_first(array $array1, array $array2)
}

/**
* Returns all errors
* Returns all errors / debug messages on the SSH layer
*
* If you are looking for messages from the SFTP layer, please see SFTP::getSFTPErrors()
*
* @return string[]
*/
Expand All @@ -4344,7 +4346,9 @@ public function getErrors(): array
}

/**
* Returns the last error
* Returns the last error received on the SSH layer
*
* If you are looking for messages from the SFTP layer, please see SFTP::getLastSFTPError()
*/
public function getLastError(): string
{
Expand Down

0 comments on commit 4427f40

Please sign in to comment.