1 files changed, 41 insertions, 30 deletions

diff --git a/build/integration/features/bootstrap/CommentsContext.php b/build/integration/features/bootstrap/CommentsContext.php
index ad2d752b4dd..53001b1c204 100644
--- a/build/integration/features/bootstrap/CommentsContext.php
+++ b/build/integration/features/bootstrap/CommentsContext.php
@@ -1,28 +1,9 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 require __DIR__ . '/../../vendor/autoload.php';
 
@@ -49,6 +30,35 @@ class CommentsContext implements \Behat\Behat\Context\Context {
 		}
 	}
 
+	/**
+	 * get a named entry from response instead of picking a random entry from values
+	 *
+	 * @param string $path
+	 *
+	 * @return array|string
+	 * @throws Exception
+	 */
+	private function getValueFromNamedEntries(string $path, array $response): mixed {
+		$next = '';
+		if (str_contains($path, ' ')) {
+			[$key, $next] = explode(' ', $path, 2);
+		} else {
+			$key = $path;
+		}
+
+		foreach ($response as $entry) {
+			if ($entry['name'] === $key) {
+				if ($next !== '') {
+					return $this->getValueFromNamedEntries($next, $entry['value']);
+				} else {
+					return $entry['value'];
+				}
+			}
+		}
+
+		return null;
+	}
+
 	/** @AfterScenario */
 	public function teardownScenario() {
 		$client = new \GuzzleHttp\Client();
@@ -127,7 +137,7 @@ class CommentsContext implements \Behat\Behat\Context\Context {
 		}
 
 		if ($res->getStatusCode() !== (int)$statusCode) {
-			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ")");
+			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ')');
 		}
 	}
 
@@ -169,13 +179,13 @@ class CommentsContext implements \Behat\Behat\Context\Context {
 		}
 
 		if ($res->getStatusCode() !== (int)$statusCode) {
-			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ")");
+			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ')');
 		}
 
 		if ($res->getStatusCode() === 207) {
 			$service = new Sabre\Xml\Service();
 			$this->response = $service->parse($res->getBody()->getContents());
-			$this->commentId = (int) ($this->response[0]['value'][2]['value'][0]['value'][0]['value'] ?? 0);
+			$this->commentId = (int)($this->getValueFromNamedEntries('{DAV:}response {DAV:}propstat {DAV:}prop {http://owncloud.org/ns}id', $this->response ?? []) ?? 0);
 		}
 	}
 
@@ -227,7 +237,7 @@ class CommentsContext implements \Behat\Behat\Context\Context {
 		}
 
 		if ($res->getStatusCode() !== (int)$statusCode) {
-			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ")");
+			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ')');
 		}
 	}
 
@@ -238,7 +248,8 @@ class CommentsContext implements \Behat\Behat\Context\Context {
 	 * @throws \Exception
 	 */
 	public function theResponseShouldContainAPropertyWithValue($key, $value) {
-		$keys = $this->response[0]['value'][2]['value'][0]['value'];
+		//		$keys = $this->response[0]['value'][1]['value'][0]['value'];
+		$keys = $this->getValueFromNamedEntries('{DAV:}response {DAV:}propstat {DAV:}prop', $this->response);
 		$found = false;
 		foreach ($keys as $singleKey) {
 			if ($singleKey['name'] === '{http://owncloud.org/ns}' . substr($key, 3)) {
@@ -263,7 +274,7 @@ class CommentsContext implements \Behat\Behat\Context\Context {
 			$count = count($this->response);
 		}
 		if ($count !== (int)$number) {
-			throw new \Exception("Found more comments than $number (" . $count . ")");
+			throw new \Exception("Found more comments than $number (" . $count . ')');
 		}
 	}
 
@@ -293,7 +304,7 @@ class CommentsContext implements \Behat\Behat\Context\Context {
 		}
 
 		if ($res->getStatusCode() !== (int)$statusCode) {
-			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ")");
+			throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ')');
 		}
 	}
 }