Merge pull request #16 from KdR88/empty-dir-patch

Listcontents implementation adhere to interface
vyuldashev · Jan 5, 2018 · 41aba8e · 41aba8e
2 parents 9c0d5f4 + bcbfbae
commit 41aba8e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/CurlFtpAdapter.php b/src/CurlFtpAdapter.php
@@ -432,7 +432,7 @@ protected function listDirectoryContents($directory, $recursive = false)
         $connection = $this->getConnection();
         $result = $connection->exec([CURLOPT_CUSTOMREQUEST => $request]);
         if ($result === false) {
-            return false;
+            return [];
         }
 
         if ($directory === '/') {

diff --git a/tests/CurlFtpAdapterTest.php b/tests/CurlFtpAdapterTest.php
@@ -245,6 +245,16 @@ public function testListContents($path)
         $this->assertCount(1, $this->adapter->listContents(dirname($path)));
     }
 
+    /**
+     * @dataProvider withSubFolderProvider
+     *
+     * @param $path
+     */
+    public function testListContentsEmptyPath($path)
+    {
+        $this->assertCount(0, $this->adapter->listContents(dirname($path)));
+    }
+
     public function filesProvider()
     {
         return [

diff --git a/tests/run.sh b/tests/run.sh
@@ -13,7 +13,7 @@ error_test()
 
 # creating directory for resources
 if test ! -d "tests/resources"; then
-	mkdir -m=0777 "tests/resources"
+	mkdir -m 0777 "tests/resources"
 	if test $? != 0; then exit 1; fi
 fi