PHPStan Pro - configurable DNS servers

phpstan · Mar 30, 2023 · f3711a2 · f3711a2
1 parent d892c34
commit f3711a2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/conf/config.neon b/conf/config.neon
@@ -221,6 +221,9 @@ parameters:
 	editorUrl: null
 	editorUrlTitle: null
 	errorFormat: null
+	pro:
+		dnsServers:
+			- '1.1.1.1'
 	__validate: true
 
 extensions:
@@ -413,6 +416,9 @@ parametersSchema:
 	editorUrl: schema(string(), nullable())
 	editorUrlTitle: schema(string(), nullable())
 	errorFormat: schema(string(), nullable())
+	pro: structure([
+		dnsServers: schema(listOf(string()), min(1)),
+	])
 
 	# irrelevant Nette parameters
 	debugMode: bool()
@@ -698,6 +704,7 @@ services:
 			analysedPaths: %analysedPaths%
 			currentWorkingDirectory: %currentWorkingDirectory%
 			fixerTmpDir: %fixerTmpDir%
+			dnsServers: %pro.dnsServers%
 
 	-
 		class: PHPStan\Dependency\DependencyResolver

diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -726,6 +726,7 @@ private function getMeta(array $allAnalysedFiles, ?array $projectConfigArray): a
 			unset($projectConfigArray['parameters']['internalErrorsCountLimit']);
 			unset($projectConfigArray['parameters']['cache']);
 			unset($projectConfigArray['parameters']['memoryLimitFile']);
+			unset($projectConfigArray['parameters']['pro']);
 			unset($projectConfigArray['parametersSchema']);
 		}
 

diff --git a/src/Command/FixerApplication.php b/src/Command/FixerApplication.php
@@ -25,6 +25,7 @@
 use PHPStan\ShouldNotHappenException;
 use Psr\Http\Message\ResponseInterface;
 use React\ChildProcess\Process;
+use React\Dns\Config\Config;
 use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
 use React\EventLoop\StreamSelectLoop;
@@ -74,6 +75,7 @@ class FixerApplication
 
 	/**
 	 * @param string[] $analysedPaths
+	 * @param list<string> $dnsServers
 	 */
 	public function __construct(
 		private FileMonitor $fileMonitor,
@@ -82,6 +84,7 @@ public function __construct(
 		private array $analysedPaths,
 		private string $currentWorkingDirectory,
 		private string $fixerTmpDir,
+		private array $dnsServers,
 	)
 	{
 	}
@@ -207,8 +210,7 @@ private function getFixerProcess(OutputInterface $output, int $serverPort): Proc
 			$this->downloadPhar($output, $pharPath, $infoPath);
 		} catch (RuntimeException $e) {
 			if (!is_file($pharPath)) {
-				$output->writeln('<fg=red>Could not download the PHPStan Pro executable.</>');
-				$output->writeln($e->getMessage());
+				$this->printDownloadError($output, $e);
 
 				throw new FixerProcessException();
 			}
@@ -293,14 +295,17 @@ private function downloadPhar(
 			$output->writeln('<fg=green>Checking if there\'s a new PHPStan Pro release...</>');
 		}
 
+		$dnsConfig = new Config();
+		$dnsConfig->nameservers = $this->dnsServers;
+
 		$client = new Browser(
 			new Connector(
 				[
 					'timeout' => 5,
 					'tls' => [
 						'cafile' => CaBundle::getBundledCaBundlePath(),
 					],
-					'dns' => '1.1.1.1',
+					'dns' => $dnsConfig,
 				],
 			),
 		);
@@ -339,8 +344,8 @@ private function downloadPhar(
 				fwrite($pharPathResource, $chunk);
 				$progressBar->setProgress($bytes);
 			});
-		}, static function (Throwable $e) use ($output): void {
-			$output->writeln(sprintf('<fg=red>Could not download the PHPStan Pro executable:</> %s', $e->getMessage()));
+		}, function (Throwable $e) use ($output): void {
+			$this->printDownloadError($output, $e);
 		});
 
 		Loop::run();
@@ -354,6 +359,19 @@ private function downloadPhar(
 		$this->writeInfoFile($infoPath, $latestInfo['version']);
 	}
 
+	private function printDownloadError(OutputInterface $output, Throwable $e): void
+	{
+		$output->writeln(sprintf('<fg=red>Could not download the PHPStan Pro executable:</> %s', $e->getMessage()));
+		$output->writeln('');
+		$output->writeln('Try different DNS servers in your configuration file:');
+		$output->writeln('');
+		$output->writeln('parameters:');
+		$output->writeln("\tpro:");
+		$output->writeln("\t\tdnsServers!:");
+		$output->writeln("\t\t\t- '8.8.8.8'");
+		$output->writeln('');
+	}
+
 	private function writeInfoFile(string $infoPath, string $version): void
 	{
 		FileWriter::write($infoPath, Json::encode([