Merge pull request #799 from eldario/fix-with-folders

Fix trouble with empty folders

Author: streamtw

src/LfmItem.php

@@ -65,7 +65,11 @@ public function isFile()
      */
     public function isImage()
     {
-        return starts_with($this->mimeType(), 'image');
+        if (!$this->isDirectory()) {
+            return starts_with($this->mimeType(), 'image');
+        }
+
+        return false;
     }
 
     /**
@@ -105,7 +109,11 @@ public function size()
 
     public function time()
     {
-        return $this->lfm->lastModified();
+        if (!$this->isDirectory()) {
+            return $this->lfm->lastModified();
+        }
+
+        return false;
     }
 
     public function thumbUrl()

tests/LfmItemTest.php

@@ -75,7 +75,8 @@ public function testIsFile()
 
     public function testIsImage()
     {
-        $this->lfm_path->shouldReceive('mimeType')->andReturn('application/plain');
+        $this->lfm_path->shouldReceive('mimeType')->andReturn('application/plain')->shouldReceive('isDirectory')
+            ->andReturn(false);
 
         $item = new LfmItem($this->lfm_path, $this->lfm);
 
@@ -150,7 +151,8 @@ public function testSize()
 
     public function testTime()
     {
-        $this->lfm_path->shouldReceive('lastModified')->andReturn(0);
+        $this->lfm_path->shouldReceive('lastModified')->andReturn(0)->shouldReceive('isDirectory')
+            ->andReturn(false);
 
         $item = new LfmItem($this->lfm_path, $this->lfm);
 
@@ -185,7 +187,8 @@ public function testIcon()
 
     public function testHasThumb()
     {
-        $this->lfm_path->shouldReceive('mimeType')->andReturn('application/plain');
+        $this->lfm_path->shouldReceive('mimeType')->andReturn('application/plain')->shouldReceive('isDirectory')
+            ->andReturn(false);
 
         $item = new LfmItem($this->lfm_path, $this->lfm);