feat: return both properties and status in propFindUnfiltered

sabre-io · Dec 11, 2023 · a93bd80 · a93bd80
1 parent ebfe0d4
commit a93bd80
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/lib/DAV/Client.php b/lib/DAV/Client.php
@@ -243,16 +243,14 @@ public function propFindUnfiltered($url, array $properties, $depth = 0)
  reset($result);
  $resourceStatusList = current($result);
  reset($resourceStatusList);
- // $resourceStatus = key($resourceStatusList);
- return current($resourceStatusList);
+
+ return ['properties' => current($resourceStatusList), 'status' => key($resourceStatusList)];
  }
 
  $newResult = [];
  foreach ($result as $href => $statusList) {
  reset($statusList);
- // $resourceStatus = key($statusList);
- $resourceProperties = current($statusList);
- $newResult[$href] = $resourceProperties;
+ $newResult[$href] = ['properties' => current($statusList), 'status' => key($statusList)];
  }
 
  return $newResult;

diff --git a/tests/Sabre/DAV/ClientTest.php b/tests/Sabre/DAV/ClientTest.php
@@ -304,8 +304,11 @@ public function testPropFindUnfilteredDepth0()
  $result = $client->propFindUnfiltered('folder1', ['{DAV:}resourcetype', '{DAV:}displayname', '{urn:zim}gir']);
 
  self::assertEquals([
- '{DAV:}resourcetype' => new Xml\Property\ResourceType('{DAV:}collection'),
- '{DAV:}displayname' => 'Folder1',
+ 'properties' => [
+ '{DAV:}resourcetype' => new Xml\Property\ResourceType('{DAV:}collection'),
+ '{DAV:}displayname' => 'Folder1',
+ ],
+ 'status' => 200,
  ], $result);
 
  $request = $client->request;
@@ -382,20 +385,32 @@ public function testPropFindUnfiltered()
 
  self::assertEquals([
  '/folder1' => [
- '{DAV:}resourcetype' => new Xml\Property\ResourceType('{DAV:}collection'),
- '{DAV:}displayname' => 'Folder1',
+ 'properties' => [
+ '{DAV:}resourcetype' => new Xml\Property\ResourceType('{DAV:}collection'),
+ '{DAV:}displayname' => 'Folder1',
+ ],
+ 'status' => 200,
  ],
  '/folder1/file1.txt' => [
- '{DAV:}resourcetype' => null,
- '{DAV:}displayname' => 'File1',
+ 'properties' => [
+ '{DAV:}resourcetype' => null,
+ '{DAV:}displayname' => 'File1',
+ ],
+ 'status' => 200,
  ],
  '/folder1/file2.txt' => [
- '{DAV:}resourcetype' => null,
- '{DAV:}displayname' => 'File2',
+ 'properties' => [
+ '{DAV:}resourcetype' => null,
+ '{DAV:}displayname' => 'File2',
+ ],
+ 'status' => 403,
  ],
  '/folder1/file3.txt' => [
- '{DAV:}resourcetype' => null,
- '{DAV:}displayname' => 'File3',
+ 'properties' => [
+ '{DAV:}resourcetype' => null,
+ '{DAV:}displayname' => 'File3',
+ ],
+ 'status' => 425,
  ],
  ], $result);