Add Tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/private/Files/SimpleFS/SimpleFolder.php b/lib/private/Files/SimpleFS/SimpleFolder.php
index 4ee61f0eec9..8ce6c013c1f 100644
--- a/lib/private/Files/SimpleFS/SimpleFolder.php
+++ b/lib/private/Files/SimpleFS/SimpleFolder.php
@@ -22,8 +22,10 @@
  */
 namespace OC\Files\SimpleFS;
 
+use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\Node;
+use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFolder;
 
 class SimpleFolder implements ISimpleFolder   {
@@ -48,10 +50,15 @@ class SimpleFolder implements ISimpleFolder   {
 		$listing = $this->folder->getDirectoryListing();
 
 		$fileListing = array_map(function(Node $file) {
-			return new SimpleFile($file);
+			if ($file instanceof File) {
+				return new SimpleFile($file);
+			}
+			return null;
 		}, $listing);
 
-		return $fileListing;
+		$fileListing = array_filter($fileListing);
+
+		return array_values($fileListing);
 	}
 
 	public function delete() {
@@ -61,6 +68,10 @@ class SimpleFolder implements ISimpleFolder   {
 	public function getFile($name) {
 		$file = $this->folder->get($name);
 
+		if (!($file instanceof File)) {
+			throw new NotFoundException();
+		}
+
 		return new SimpleFile($file);
 	}