Issue bot - do not run PHP 7.1

phpstan · Jun 18, 2023 · 65b4e8e · 65b4e8e
1 parent f9cd516
commit 65b4e8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/issue-bot/src/Console/DownloadCommand.php b/issue-bot/src/Console/DownloadCommand.php
@@ -96,12 +96,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 
 		$matrix = [];
-		foreach ([70100, 70200, 70300, 70400, 80000, 80100, 80200] as $phpVersion) {
+		foreach ([70200, 70300, 70400, 80000, 80100, 80200] as $phpVersion) {
 			$phpVersionHashes = [];
 			foreach ($cachedResults as $hash => $result) {
 				$resultPhpVersions = array_keys($result->getVersionedErrors());
 				if ($resultPhpVersions === [70400]) {
-					$resultPhpVersions = [70100, 70200, 70300, 70400, 80000];
+					$resultPhpVersions = [70200, 70300, 70400, 80000];
 				}
 
 				if (!in_array(80100, $resultPhpVersions, true)) {

diff --git a/issue-bot/src/Console/EvaluateCommand.php b/issue-bot/src/Console/EvaluateCommand.php
@@ -98,7 +98,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					throw new Exception(sprintf('Hash %s does not exist in new results.', $hash));
 				}
 
-				$newTabs = $this->tabCreator->create($this->filterErrors($originalErrors, $newResults[$hash]));
+				$originalPhpVersions = array_keys($originalErrors);
+				$newResult = $newResults[$hash];
+				if (array_key_exists(70100, $originalErrors) || $originalPhpVersions === [70400]) {
+					$newResult[70100] = $newResult[70200];
+				}
+
+				$newTabs = $this->tabCreator->create($this->filterErrors($originalErrors, $newResult));
 				$text = $this->postGenerator->createText($hash, $originalTabs, $newTabs, $botComments);
 				if ($text === null) {
 					continue;