Merge pull request #44410 from nextcloud/fix/fetcher-on-null

susnux · web-flow · commit c352f0198b50 · 2024-03-25T12:19:00.000+01:00
fix(AppStore\Fetcher): Ensure `get` returns an array
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -181,7 +181,7 @@ public function get($allowUnstable = false) {
 		try {
 			$responseJson = $this->fetch($ETag, $content, $allowUnstable);
 
-			if (empty($responseJson)) {
+			if (empty($responseJson) || empty($responseJson['data'])) {
 				return [];
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public function get($allowUnstable = false) {`
`181`	`181`	`try {`
`182`	`182`	`$responseJson = $this->fetch($ETag, $content, $allowUnstable);`
`183`	`183`
`184`		`- if (empty($responseJson)) {`
	`184`	`+ if (empty($responseJson) \|\| empty($responseJson['data'])) {`
`185`	`185`	`return [];`
`186`	`186`	`}`
`187`	`187`