Skip to content

Commit 3464d8a

Browse files
committed
Rename ignore-new-errors option to only-remove-errors
1 parent f285fc4 commit 3464d8a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Diff for: src/Command/AnalyseCommand.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected function configure(): void
107107
new InputOption('watch', null, InputOption::VALUE_NONE, 'Launch PHPStan Pro'),
108108
new InputOption('pro', null, InputOption::VALUE_NONE, 'Launch PHPStan Pro'),
109109
new InputOption('fail-without-result-cache', null, InputOption::VALUE_NONE, 'Return non-zero exit code when result cache is not used'),
110-
new InputOption('ignore-new-errors', null, InputOption::VALUE_NONE, 'Ignore new errors when generating the baseline.'),
110+
new InputOption('only-remove-errors', null, InputOption::VALUE_NONE, 'Only remove existing errors from the baseline. Do not add new ones.'),
111111
]);
112112
}
113113

@@ -142,7 +142,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
142142
$debugEnabled = (bool) $input->getOption('debug');
143143
$fix = (bool) $input->getOption('fix') || (bool) $input->getOption('watch') || (bool) $input->getOption('pro');
144144
$failWithoutResultCache = (bool) $input->getOption('fail-without-result-cache');
145-
$ignoreNewErrors = (bool) $input->getOption('ignore-new-errors');
145+
$onlyRemoveErrors = (bool) $input->getOption('only-remove-errors');
146146

147147
/** @var string|false|null $generateBaselineFile */
148148
$generateBaselineFile = $input->getOption('generate-baseline');
@@ -189,8 +189,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
189189
return $inceptionResult->handleReturn(1, null, $this->analysisStartTime);
190190
}
191191

192-
if ($generateBaselineFile === null && $ignoreNewErrors) {
193-
$inceptionResult->getStdOutput()->getStyle()->error('You must pass the --generate-baseline option alongside --ignore-new-errors.');
192+
if ($generateBaselineFile === null && $onlyRemoveErrors) {
193+
$inceptionResult->getStdOutput()->getStyle()->error('You must pass the --generate-baseline option alongside --only-remove-errors.');
194194
return $inceptionResult->handleReturn(1, null, $this->analysisStartTime);
195195
}
196196

@@ -423,7 +423,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
423423
return $inceptionResult->handleReturn(1, $analysisResult->getPeakMemoryUsageBytes(), $this->analysisStartTime);
424424
}
425425

426-
return $this->generateBaseline($generateBaselineFile, $inceptionResult, $analysisResult, $output, $allowEmptyBaseline, $baselineExtension, $failWithoutResultCache, $ignoreNewErrors, $container);
426+
return $this->generateBaseline($generateBaselineFile, $inceptionResult, $analysisResult, $output, $allowEmptyBaseline, $baselineExtension, $failWithoutResultCache, $onlyRemoveErrors, $container);
427427
}
428428

429429
/** @var ErrorFormatter $errorFormatter */
@@ -599,12 +599,12 @@ private function getMessageFromInternalError(FileHelper $fileHelper, InternalErr
599599
return $message;
600600
}
601601

602-
private function generateBaseline(string $generateBaselineFile, InceptionResult $inceptionResult, AnalysisResult $analysisResult, OutputInterface $output, bool $allowEmptyBaseline, string $baselineExtension, bool $failWithoutResultCache, bool $ignoreNewErrors, Container $container): int
602+
private function generateBaseline(string $generateBaselineFile, InceptionResult $inceptionResult, AnalysisResult $analysisResult, OutputInterface $output, bool $allowEmptyBaseline, string $baselineExtension, bool $failWithoutResultCache, bool $onlyRemoveErrors, Container $container): int
603603
{
604604
$baselineFileDirectory = dirname($generateBaselineFile);
605605
$fileHelper = $container->getByType(FileHelper::class);
606606
$baselinePathHelper = new ParentDirectoryRelativePathHelper($baselineFileDirectory);
607-
if ($ignoreNewErrors) {
607+
if ($onlyRemoveErrors) {
608608
$analysisResult = $this->filterAnalysisResultForExistingErrors($analysisResult, $generateBaselineFile, $inceptionResult, $fileHelper, $baselinePathHelper);
609609
}
610610

Diff for: tests/PHPStan/Command/AnalyseCommandTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function testGenerateBaselineIgnoreNewErrorsRemoveFile(): void
8989
'--configuration' => $baselineFile,
9090
'--level' => '9',
9191
'--generate-baseline' => $baselineFile,
92-
'--ignore-new-errors' => true,
92+
'--only-remove-errors' => true,
9393
]);
9494
@unlink($baselineFile);
9595

@@ -113,7 +113,7 @@ public function testGenerateBaselineIgnoreNewErrorsReducedErrorCount(): void
113113
'--configuration' => $baselineFileSecondRun,
114114
'--level' => '9',
115115
'--generate-baseline' => $baselineFileSecondRun,
116-
'--ignore-new-errors' => true,
116+
'--only-remove-errors' => true,
117117
]);
118118
@unlink($baselineFileSecondRun);
119119

@@ -137,7 +137,7 @@ public function testGenerateBaselineIgnoreNewErrorsIncreasedErrorCount(): void
137137
'--configuration' => $baselineFileSecondRun,
138138
'--level' => '9',
139139
'--generate-baseline' => $baselineFileSecondRun,
140-
'--ignore-new-errors' => true,
140+
'--only-remove-errors' => true,
141141
]);
142142
@unlink($baselineFileSecondRun);
143143

@@ -159,7 +159,7 @@ public function testGenerateBaselineIgnoreNewErrorsEmptyBaseline(): void
159159
'--configuration' => $baselineFile,
160160
'--level' => '9',
161161
'--generate-baseline' => $baselineFile,
162-
'--ignore-new-errors' => true,
162+
'--only-remove-errors' => true,
163163
]);
164164
@unlink($baselineFile);
165165

0 commit comments

Comments
 (0)