From a623e09868ce62c4f1773f7672e011e32bdf26d8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 3 Sep 2018 19:13:22 +0200 Subject: remove old trashbin endpoint Signed-off-by: Robin Appelman --- build/integration/features/bootstrap/Trashbin.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'build/integration') diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php index 49d547a5edc..81725e940d5 100644 --- a/build/integration/features/bootstrap/Trashbin.php +++ b/build/integration/features/bootstrap/Trashbin.php @@ -51,13 +51,17 @@ trait Trashbin { */ public function listTrashbinFolder($user, $path){ $this->asAn($user); - $params = '?dir=' . rawurlencode('/' . trim($path, '/')); - $this->sendingToWithDirectUrl('GET', '/index.php/apps/files_trashbin/ajax/list.php' . $params, null); + $this->sendingToWithDirectUrl('PROPFIND', "/remote.php/dav/trashbin/$user/$path", null); $this->theHTTPStatusCodeShouldBe('200'); - $response = json_decode($this->response->getBody(), true); - - return $response['data']['files']; + $body = $this->response->getBody(); + if($body && substr($body, 0, 1) === '<') { + $reader = new Sabre\Xml\Reader(); + $reader->xml($body); + return $reader->parse(); + } else { + return []; + } } /** -- cgit v1.2.3