refactor: change the isDirectory method

bowphp · Dec 13, 2024 · d1835f2 · d1835f2
1 parent 9cb52e3
commit d1835f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,6 +7,7 @@ env:
   FTP_USER: username
   FTP_PASSWORD: password
   FTP_PORT: 21
+  FTP_ROOT: /home/vsftpd/username
 
 jobs:
   lunix-tests:

diff --git a/src/Storage/Service/FTPService.php b/src/Storage/Service/FTPService.php
@@ -177,6 +177,8 @@ public function changePath(?string $path = null)
         if ($base_path && (!@ftp_chdir($this->connection, $base_path))) {
             throw new RuntimeException('Root is invalid or does not exist: ' . $base_path);
         }
+
+        ftp_pwd($this->connection);
     }
 
     /**
@@ -483,13 +485,18 @@ public function isFile(string $filename): bool
      */
     public function isDirectory(string $dirname): bool
     {
-        $listing = $this->listDirectoryContents();
+        $original_directory = ftp_pwd($this->connection);
 
-        $dirname_info = array_filter($listing, function ($item) use ($dirname) {
-            return $item['type'] === 'directory' && $item['name'] === $dirname;
-        });
+        // Test if you can change directory to $dirname
+        // suppress errors in case $dir is not a file or not a directory
+        if (!@ftp_chdir($this->connection, $dirname)) {
+            return false;
+        }
 
-        return count($dirname_info) !== 0;
+        // If it is a directory, then change the directory back to the original directory
+        ftp_chdir($this->connection, $original_directory);
+
+        return true;
     }
 
     /**