diff --git a/.travis.yml b/.travis.yml index 1bfdcf3..2fc013b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ matrix: - php: 5.6 before_script: + - sudo apt-get update -qq - sudo apt-get install -y -qq libssh2-1-dev libssh2-php - pecl install -f ssh2-beta < .noninteractive - php -m | grep ssh2 diff --git a/src/Ssh/Sftp.php b/src/Ssh/Sftp.php index 3cb7624..e0d10b8 100644 --- a/src/Ssh/Sftp.php +++ b/src/Ssh/Sftp.php @@ -275,14 +275,14 @@ private function scanDirectory($directory, $recursive) } $filename = sprintf('%s/%s', $directory, $result); - $children = $this->scanDirectory($filename, $recursive); - if (false === $children) { + if (false === @scandir($this->getUrl($filename))) { $files[] = $filename; } else { $directories[] = $filename; if ($recursive) { + $children = $this->scanDirectory($filename, $recursive); $files = array_merge($files, $children[0]); $directories = array_merge($directories, $children[1]); }