Merge branch '1.0' into 2.0

phpseclib · Feb 8, 2024 · 34ab00b · 34ab00b
2 parents bcc04ab + a69364d
commit 34ab00b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php
@@ -3789,7 +3789,7 @@ function getSFTPLog()
     }
 
     /**
-     * Returns all errors
+     * Returns all errors on the SFTP layer
      *
      * @return array
      * @access public
@@ -3800,7 +3800,7 @@ function getSFTPErrors()
     }
 
     /**
-     * Returns the last error
+     * Returns the last error on the SFTP layer
      *
      * @return string
      * @access public

diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
@@ -4704,7 +4704,9 @@ function _array_intersect_first($array1, $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[]
      * @access public
@@ -4715,7 +4717,9 @@ 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
      * @access public