Skip to content

Commit

Permalink
Merge branch '2.0' into 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
terrafrost committed Feb 8, 2024
2 parents 89f0d3c + 34ab00b commit 8f3a665
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 @@ -3446,7 +3446,7 @@ public function getSFTPLog()
}

/**
* Returns all errors
* Returns all errors on the SFTP layer
*
* @return array
*/
Expand All @@ -3456,7 +3456,7 @@ public function getSFTPErrors()
}

/**
* Returns the last error
* Returns the last error on the SFTP layer
*
* @return 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 @@ -4730,7 +4730,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 @@ -4740,7 +4742,9 @@ public function getErrors()
}

/**
* 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()
*
* @return string
*/
Expand Down

0 comments on commit 8f3a665

Please sign in to comment.