Make sure a {DAV:}prop is not empty

<d:prop/> => isEmptyElement = true, readInnerXml = '' <d:prop></d:prop> => isEmptyElement = false, readInnerXml = '' Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
sabre-io · Oct 9, 2021 · ee03532 · ee03532
1 parent c1afdc7
commit ee03532
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/lib/DAV/Xml/Element/Response.php b/lib/DAV/Xml/Element/Response.php
@@ -181,7 +181,7 @@ public static function xmlDeserialize(Reader $reader)
         // child-elements implies 'no value' in {DAV:}prop, so we want to skip
         // deserializers and just set null for those.
         $reader->elementMap['{DAV:}prop'] = function (Reader $reader) {
-            if ($reader->isEmptyElement) {
+            if ($reader->isEmptyElement || '' === $reader->readInnerXml()) {
                 $reader->next();
 
                 return [];

diff --git a/tests/Sabre/DAV/Xml/Element/ResponseTest.php b/tests/Sabre/DAV/Xml/Element/ResponseTest.php
@@ -301,4 +301,35 @@ public function testDeserializeComplexPropertyEmpty()
             $result['value']
         );
     }
+
+    public function testDeserializeNoProperties()
+    {
+        $xml = '<?xml version="1.0"?>
+<d:response xmlns:d="DAV:">
+  <d:href>/uri</d:href>
+  <d:propstat>
+    <d:prop></d:prop>
+    <d:status>HTTP/1.1 200 OK</d:status>
+  </d:propstat>  
+  <d:propstat>
+    <d:prop>
+        <d:foo />
+    </d:prop>
+    <d:status>HTTP/1.1 404 OK</d:status>
+  </d:propstat>
+</d:response>
+';
+
+        $result = $this->parse($xml, [
+            '{DAV:}response' => Response::class,
+        ]);
+        $this->assertEquals(
+            new Response('/uri', [
+                '404' => [
+                    '{DAV:}foo' => null,
+                ],
+            ]),
+            $result['value']
+        );
+    }
 }