No 404 status in case there is any other status

sabre-io · May 3, 2016 · 17f54b3 · 17f54b3
1 parent a01f4ab
commit 17f54b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/DAV/Xml/Element/Response.php b/lib/DAV/Xml/Element/Response.php
@@ -127,14 +127,14 @@ function xmlSerialize(Writer $writer) {
         $empty = true;
 
         foreach ($this->getResponseProperties() as $status => $properties) {
-            if ( $properties && (ctype_digit($status) || is_int($status))) {
+            if ($properties && (ctype_digit($status) || is_int($status))) {
                 $empty = false;
                 $writer->startElement('{DAV:}propstat');
                 $writer->writeElement('{DAV:}prop', $properties);
                 $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
                 $writer->endElement(); // {DAV:}propstat
             }
-            if ( !$properties && (ctype_digit($status) || is_int($status))) {
+            if ($empty && !$properties && (ctype_digit($status) || is_int($status))) {
                 $empty = false;
                 $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
             }

diff --git a/tests/Sabre/DAV/Sync/PluginTest.php b/tests/Sabre/DAV/Sync/PluginTest.php
@@ -96,6 +96,7 @@ function testSyncInitialSyncCollection() {
 
         $this->assertEquals(207, $response->status, 'Full response body:' . $response->body);
 
+        /** @var DAV\Xml\Response\MultiStatus $multiStatus */
         $multiStatus = $this->server->xml->parse($response->getBodyAsString());
 
         // Checking the sync-token