Allow Ftp::getMetadata() to work for directories.

SilverFire · May 22, 2015 · 5901bb5 · 5901bb5
1 parent a1d15d4
commit 5901bb5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Adapter/Ftp.php b/src/Adapter/Ftp.php
@@ -302,6 +302,19 @@ protected function createActualDirectory($directory, $connection)
     public function getMetadata($path)
     {
         $listing = ftp_rawlist($this->getConnection(), $path);
+        if (!strlen($path)) {
+            return ['type' => 'dir', 'path' => ''];
+        }
+
+        $connection = $this->getConnection();
+
+        if (@ftp_chdir($connection, $path)) {
+            $this->setConnectionRoot();
+
+            return ['type' => 'dir', 'path' => $path];
+        }
+
+        $listing = ftp_rawlist($connection, $path);
 
         if (empty($listing)) {
             return false;

diff --git a/tests/FtpTests.php b/tests/FtpTests.php
@@ -66,11 +66,14 @@ function ftp_login($connection)
     return true;
 }
 
-function ftp_chdir($connection)
+function ftp_chdir($connection, $directory)
 {
     if ($connection === 'chdir.fail') {
         return false;
     }
+    if ($directory === 'not.found') {
+        return false;
+    }
 
     return true;
 }