centralize timeout

Author: staabm

src/Command/BisectCommand.php

@@ -108,8 +108,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 
 		$client = (new HttpClientFactory())->createClient([
-			RequestOptions::TIMEOUT => 30,
-			RequestOptions::CONNECT_TIMEOUT => 10,
 			'headers' => [
 				'Authorization' => 'token ' . $token,
 				'Accept' => 'application/vnd.github.v3+json',

src/Command/FixerApplication.php

@@ -326,10 +326,7 @@ private function downloadPhar(
 			$output->writeln('<fg=green>Checking if there\'s a new PHPStan Pro release...</>');
 		}
 
-		$client = $this->httpClientFactory->createClient([
-			RequestOptions::TIMEOUT => 30,
-			RequestOptions::CONNECT_TIMEOUT => 5,
-		]);
+		$client = $this->httpClientFactory->createClient([]);
 
 		$latestUrl = sprintf('https://fixer-download-api.phpstan.com/latest?%s', http_build_query(['phpVersion' => PHP_VERSION_ID, 'branch' => $branch]));
 

src/Internal/HttpClientFactory.php

@@ -3,19 +3,18 @@
 namespace PHPStan\Internal;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\RequestOptions;
 use PHPStan\DependencyInjection\AutowiredService;
 use function extension_loaded;
 
 #[AutowiredService]
 final class HttpClientFactory
 {
 
-	/**
-	 * @param array<mixed> $defaults
-	 *
-	 * @see \GuzzleHttp\RequestOptions
-	 */
-	public function __construct(private readonly array $defaults = [])
+	public function __construct(
+		private int $timeout = 30,
+		private int $connectTimeout = 10,
+	)
 	{
 	}
 
@@ -33,7 +32,12 @@ public function createClient(array $config): Client
 			$config['headers']['Accept-Encoding'] = 'gzip,deflate';
 		}
 
-		return new Client($config + $this->defaults);
+		$defaults = [
+			RequestOptions::TIMEOUT => $this->timeout,
+			RequestOptions::CONNECT_TIMEOUT => $this->connectTimeout,
+		];
+
+		return new Client($config + $defaults);
 	}
 
 }