[6.x] Add a timeout to Marketplace API requests

src/Marketplace/Client.php

@@ -71,6 +71,7 @@ private function request(string $method, string $endpoint, array $params = [])
             return $this->cache()->rememberWithExpiration($key, function () use ($method, $endpoint, $params) {
                 $response = Guzzle::request($method, $endpoint, [
                     'verify' => $this->verifySsl,
+                    'timeout' => 5,
                     ($method === 'GET' ? 'query' : 'json') => $params,
                 ]);
 

src/Marketplace/Marketplace.php

@@ -3,7 +3,7 @@
 namespace Statamic\Marketplace;
 
 use Facades\Statamic\Marketplace\Client;
-use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\TransferException;
 use Illuminate\Support\Facades\Cache;
 use Statamic\Facades\Addon;
 use Statamic\Marketplace\Addon as AddonProduct;
@@ -23,7 +23,7 @@ public function packages(array $packages)
                 $response = Client::post($uri, ['packages' => $packages]);
 
                 return [60 => collect($response['data'])];
-            } catch (RequestException $e) {
+            } catch (TransferException $e) {
                 return [5 => collect()];
             }
         });
@@ -46,7 +46,7 @@ public function releases($package, $params = [])
                     'data' => collect($response['data']),
                     'meta' => $response['meta'] ?? null,
                 ]];
-            } catch (RequestException $e) {
+            } catch (TransferException $e) {
                 return $fallback;
             }
         });
@@ -81,7 +81,7 @@ public function themes()
                 $response = Client::get($uri);
 
                 return [60 => collect($response['data'])];
-            } catch (RequestException $e) {
+            } catch (TransferException $e) {
 
                 return [5 => collect()];
             }

tests/Composer/CoreChangelogTest.php

@@ -2,7 +2,11 @@
 
 namespace Tests\Composer;
 
+use Facades\GuzzleHttp\Client;
 use Facades\Statamic\Version;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Psr7\Request;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Updater\CoreChangelog;
 use Tests\TestCase;
 
@@ -18,4 +22,15 @@ protected function changelog()
 
         return new CoreChangelog;
     }
+
+    #[Test]
+    public function it_returns_an_empty_changelog_when_the_marketplace_times_out()
+    {
+        Client::shouldReceive('request')
+            ->withArgs(fn ($method, $uri, $options) => $options['timeout'] === 5)
+            ->once()
+            ->andThrow(new ConnectException('', new Request('GET', '/api/v1/marketplace/packages/statamic/cms/releases')));
+
+        $this->assertCount(0, $this->changelog()->get());
+    }
 }