Merge pull request #1040 from nextcloud/fix/noid/deserialize-list

using deserializeList instead
nextcloud · Jun 13, 2022 · ec72970 · ec72970
2 parents 5ae52ac + 93b3f91
commit ec72970
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/lib/Service/ShareWrapperService.php b/lib/Service/ShareWrapperService.php
@@ -227,7 +227,7 @@ public function getSharedWith(
 				throw new InvalidItemException();
 			}
 
-			return $this->deserializeArray($cachedData, ShareWrapper::class);
+			return $this->deserializeList($cachedData, ShareWrapper::class);
 		} catch (InvalidItemException $e) {
 		}
 

diff --git a/lib/Tools/Traits/TDeserialize.php b/lib/Tools/Traits/TDeserialize.php
@@ -77,14 +77,42 @@ public function deserialize(array $data, string $class): IDeserializable {
 	}
 
 
+	/**
+	 * @param array $data
+	 * @param string $class
+	 * @param bool $associative
+	 *
+	 * @return IDeserializable[]
+	 */
+	public function deserializeArray(array $data, string $class, bool $associative = false): array {
+		$arr = [];
+		foreach ($data as $key => $entry) {
+			if (!is_array($entry)) {
+				continue;
+			}
+
+			try {
+				if ($associative) {
+					$arr[$key] = $this->deserialize($entry, $class);
+				} else {
+					$arr[] = $this->deserialize($entry, $class);
+				}
+			} catch (InvalidItemException $e) {
+			}
+		}
+
+		return $arr;
+	}
+
+
 	/**
 	 * @param string $json
 	 * @param string $class
 	 *
 	 * @return IDeserializable[]
 	 * @throws InvalidItemException
 	 */
-	public function deserializeArray(string $json, string $class): array {
+	public function deserializeList(string $json, string $class): array {
 		$arr = [];
 		$data = json_decode($json, true);
 		if (!is_array($data)) {
@@ -99,6 +127,7 @@ public function deserializeArray(string $json, string $class): array {
 	}
 
 
+
 	/**
 	 * @param string $json
 	 * @param string $class