feat: [Sftp] prevent Sftp Adapter from deleting directories when usin…

…g delete
thephpleague · Dec 26, 2023 · cbcde25 · cbcde25
1 parent e897544
commit cbcde25
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/PhpseclibV3/SftpAdapter.php b/src/PhpseclibV3/SftpAdapter.php
@@ -15,6 +15,7 @@
 use League\Flysystem\UnableToCheckFileExistence;
 use League\Flysystem\UnableToCopyFile;
 use League\Flysystem\UnableToCreateDirectory;
+use League\Flysystem\UnableToDeleteFile;
 use League\Flysystem\UnableToMoveFile;
 use League\Flysystem\UnableToReadFile;
 use League\Flysystem\UnableToRetrieveMetadata;
@@ -176,9 +177,24 @@ public function readStream(string $path)
 
     public function delete(string $path): void
     {
+        if (empty($path)) {
+            throw UnableToDeleteFile::atLocation($path);
+        }
+
+        $fileExists = $this->fileExists($path);
+
+        if ($fileExists === false) {
+            if ($this->directoryExists($path)) {
+                throw UnableToDeleteFile::atLocation($path);
+            }
+
+            return;
+        }
+
         $location = $this->prefixer->prefixPath($path);
         $connection = $this->connectionProvider->provideConnection();
-        $connection->delete($location);
+
+        $connection->delete($location, false);
     }
 
     public function deleteDirectory(string $path): void