[5.x] Avoid error when marketplace client returns null (#10996)

statamic · Oct 22, 2024 · 9fe1412 · 9fe1412
1 parent 030ef7b
commit 9fe1412
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/Marketplace/Marketplace.php b/src/Marketplace/Marketplace.php
@@ -20,10 +20,16 @@ public function package($package, $version = null, $edition = null)
         }
 
         return Cache::rememberWithExpiration("marketplace-$uri", function () use ($uri) {
+            $fallback = [5 => null];
+
             try {
-                return [60 => Client::get($uri)['data']];
+                if (! $response = Client::get($uri)) {
+                    return $fallback;
+                }
+
+                return [60 => $response['data']];
             } catch (RequestException $e) {
-                return [5 => null];
+                return $fallback;
             }
         });
     }
@@ -33,10 +39,16 @@ public function releases($package)
         $uri = "packages/$package/releases";
 
         return Cache::rememberWithExpiration("marketplace-$uri", function () use ($uri) {
+            $fallback = [5 => collect()];
+
             try {
-                return [60 => collect(Client::get($uri)['data'])];
+                if (! $response = Client::get($uri)) {
+                    return $fallback;
+                }
+
+                return [60 => collect($response['data'])];
             } catch (RequestException $e) {
-                return [5 => collect()];
+                return $fallback;
             }
         });
     }