From f58090087fe786ea14b2273607558683bede1234 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Thu, 11 Jul 2019 01:11:22 +0200
Subject: [PATCH] Fix directory detection for non microsoft dav servers

---
 changelog.md          |  4 ++++
 readme.md             |  2 +-
 src/WebDAVAdapter.php | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 515536a..0c95b82 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.9 - xxx
+
+* Made detection of directories compliant with rfc4918 (#53).
+
 ## 1.0.8 - 2019-07-08
 
 * Made some properties private to allow them to be overwritten so other types of WebDAV servers can be supported (#51).
diff --git a/readme.md b/readme.md
index f1a2de4..6a1d574 100644
--- a/readme.md
+++ b/readme.md
@@ -18,7 +18,7 @@ This is a Flysystem adapter for the WebDAV.
 composer require league/flysystem-webdav
 ```
 
-# Bootstrap
+## Bootstrap
 
 ``` php
 <?php
diff --git a/src/WebDAVAdapter.php b/src/WebDAVAdapter.php
index 55a490e..c6a8eed 100644
--- a/src/WebDAVAdapter.php
+++ b/src/WebDAVAdapter.php
@@ -12,6 +12,7 @@
 use Sabre\DAV\Client;
 use Sabre\DAV\Exception;
 use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\Xml\Property\ResourceType;
 use Sabre\HTTP\HttpException;
 
 class WebDAVAdapter extends AbstractAdapter
@@ -28,6 +29,7 @@ class WebDAVAdapter extends AbstractAdapter
         '{DAV:}getcontenttype',
         '{DAV:}getlastmodified',
         '{DAV:}iscollection',
+        '{DAV:}resourcetype',
     ];
 
     /**
@@ -400,8 +402,18 @@ protected function normalizeObject(array $object, $path)
         return $result;
     }
 
+    /**
+     * @param array $object
+     * @return bool
+     */
     protected function isDirectory(array $object)
     {
+        if (isset($object['{DAV:}resourcetype'])) {
+            /** @var ResourceType $resourceType */
+            $resourceType = $object['{DAV:}resourcetype'];
+            return $resourceType->is('{DAV:}collection');
+        }
+
         return isset($object['{DAV:}iscollection']) && $object['{DAV:}iscollection'] === '1';
     }
 }