made HttpClientFactory a service

Author: staabm

src/Command/BisectCommand.php

@@ -107,7 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 
-		$client = HttpClientFactory::createClient([
+		$client = (new HttpClientFactory())->createClient([
 			RequestOptions::TIMEOUT => 30,
 			RequestOptions::CONNECT_TIMEOUT => 10,
 			'headers' => [

src/Command/FixerApplication.php

@@ -93,6 +93,7 @@ public function __construct(
 		private ?string $editorUrl,
 		#[AutowiredParameter]
 		private string $usedLevel,
+		private HttpClientFactory $httpClientFactory,
 	)
 	{
 	}
@@ -325,7 +326,7 @@ private function downloadPhar(
 			$output->writeln('<fg=green>Checking if there\'s a new PHPStan Pro release...</>');
 		}
 
-		$client = HttpClientFactory::createClient([
+		$client = $this->httpClientFactory->createClient([
 			RequestOptions::TIMEOUT => 30,
 			RequestOptions::CONNECT_TIMEOUT => 5,
 		]);

src/Internal/HttpClientFactory.php

@@ -3,17 +3,28 @@
 namespace PHPStan\Internal;
 
 use GuzzleHttp\Client;
+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 = [])
+	{
+	}
+
 	/**
 	 * @param array<mixed> $config
 	 *
 	 * @see \GuzzleHttp\RequestOptions
 	 */
-	public static function createClient(array $config): Client
+	public function createClient(array $config): Client
 	{
 		if (
 			!isset($config['headers']['Accept-Encoding'])
@@ -22,7 +33,7 @@ public static function createClient(array $config): Client
 			$config['headers']['Accept-Encoding'] = 'gzip,deflate';
 		}
 
-		return new Client($config);
+		return new Client($config + $this->defaults);
 	}
 
 }