Skip to content

Commit 9fe1412

Browse files
authored
[5.x] Avoid error when marketplace client returns null (#10996)
1 parent 030ef7b commit 9fe1412

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/Marketplace/Marketplace.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@ public function package($package, $version = null, $edition = null)
2020
}
2121

2222
return Cache::rememberWithExpiration("marketplace-$uri", function () use ($uri) {
23+
$fallback = [5 => null];
24+
2325
try {
24-
return [60 => Client::get($uri)['data']];
26+
if (! $response = Client::get($uri)) {
27+
return $fallback;
28+
}
29+
30+
return [60 => $response['data']];
2531
} catch (RequestException $e) {
26-
return [5 => null];
32+
return $fallback;
2733
}
2834
});
2935
}
@@ -33,10 +39,16 @@ public function releases($package)
3339
$uri = "packages/$package/releases";
3440

3541
return Cache::rememberWithExpiration("marketplace-$uri", function () use ($uri) {
42+
$fallback = [5 => collect()];
43+
3644
try {
37-
return [60 => collect(Client::get($uri)['data'])];
45+
if (! $response = Client::get($uri)) {
46+
return $fallback;
47+
}
48+
49+
return [60 => collect($response['data'])];
3850
} catch (RequestException $e) {
39-
return [5 => collect()];
51+
return $fallback;
4052
}
4153
});
4254
}

0 commit comments

Comments
 (0)