FtpServer, SshServer: purge() checkes if directory exists [Closes #126]

dg · May 7, 2019 · 4526b88 · 4526b88
1 parent e59e688
commit 4526b88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Deployment/FtpServer.php b/src/Deployment/FtpServer.php
@@ -209,6 +209,10 @@ public function removeDir(string $dir): void
 	 */
 	public function purge(string $dir, callable $progress = null): void
 	{
+		if (!$this->isDir($dir)) {
+			return;
+		}
+
 		$dirs = [];
 		foreach ((array) Safe::ftp_nlist($this->connection, $dir) as $entry) {
 			if ($entry == null || $entry === $dir || preg_match('#(^|/)\\.+$#', $entry)) { // intentionally ==

diff --git a/src/Deployment/SshServer.php b/src/Deployment/SshServer.php
@@ -175,9 +175,12 @@ public function removeDir(string $dir): void
 	 */
 	public function purge(string $dir, callable $progress = null): void
 	{
-		$dirs = $entries = [];
+		if (!file_exists($path = 'ssh2.sftp://' . (int) $this->sftp . $dir)) {
+			return;
+		}
 
-		$iterator = Safe::dir($path = 'ssh2.sftp://' . (int) $this->sftp . $dir);
+		$dirs = $entries = [];
+		$iterator = Safe::dir($path);
 		while (($entry = $iterator->read()) !== false) {
 			if ($entry !== '.' && $entry !== '..') {
 				$entries[] = $entry;