Merge pull request #1 from fraserreed/recursive-list

Fraser Reed · Fraser Reed · commit d3d3f159799a · 2013-10-22T17:35:20.000-07:00
Reproduce master merge request for recursive lists
diff --git 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]);
                 }

Original file line number	Diff line number	Diff line change
`@@ -275,14 +275,14 @@ private function scanDirectory($directory, $recursive)`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`$filename = sprintf('%s/%s', $directory, $result);`
`278`		`- $children = $this->scanDirectory($filename, $recursive);`
`279`	`278`
`280`		`- if (false === $children) {`
	`279`	`+ if (false === @scandir($this->getUrl($filename))) {`
`281`	`280`	`$files[] = $filename;`
`282`	`281`	`} else {`
`283`	`282`	`$directories[] = $filename;`
`284`	`283`
`285`	`284`	`if ($recursive) {`
	`285`	`+ $children = $this->scanDirectory($filename, $recursive);`
`286`	`286`	`$files = array_merge($files, $children[0]);`
`287`	`287`	`$directories = array_merge($directories, $children[1]);`
`288`	`288`	`}`