Skip to content

[Output] Drop checkstyle to avoid manual fixes in PRs #5566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 1 commit into from
Feb 15, 2021
Merged

[Output] Drop checkstyle to avoid manual fixes in PRs #5566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions docs/checkstyle.md
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions packages/changes-reporting/src/Output/CheckstyleOutputFormatter.php
View file
Open in desktop

This file was deleted.

105 changes: 0 additions & 105 deletions packages/changes-reporting/src/Xml/CheckstyleDOMElementFactory.php
View file
Open in desktop

This file was deleted.

13 changes: 4 additions & 9 deletions src/Configuration/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace Rector\Core\Configuration;

use Jean85\PrettyVersions;
use Rector\ChangesReporting\Output\CheckstyleOutputFormatter;
use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
use Rector\ChangesReporting\Output\JsonOutputFormatter;
use Rector\Core\Exception\Configuration\InvalidConfigurationException;
use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment;
Expand Down Expand Up @@ -267,10 +267,7 @@ public function validateConfigParameters(): void

public function shouldHideClutter(): bool
{
if ($this->outputFormat === JsonOutputFormatter::NAME) {
return true;
}
return $this->outputFormat === CheckstyleOutputFormatter::NAME;
return $this->outputFormat !== ConsoleOutputFormatter::NAME;
}

public function shouldShowDiffs(): bool
Expand All @@ -284,11 +281,9 @@ private function canShowProgressBar(InputInterface $input): bool
if ($noProgressBar) {
return false;
}

$optionOutputFormat = $input->getOption(Option::OPTION_OUTPUT_FORMAT);
if ($optionOutputFormat === JsonOutputFormatter::NAME) {
return false;
}
return $input->getOption(Option::OPTION_OUTPUT_FORMAT) !== CheckstyleOutputFormatter::NAME;
return $optionOutputFormat === ConsoleOutputFormatter::NAME;
}

private function sanitizeOutputFileValue(?string $outputFileOption): ?string
Expand Down
4 changes: 2 additions & 2 deletions src/Console/ConsoleApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use Composer\XdebugHandler\XdebugHandler;
use OutOfBoundsException;
use Rector\ChangesReporting\Output\CheckstyleOutputFormatter;
use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
use Rector\ChangesReporting\Output\JsonOutputFormatter;
use Rector\Core\Bootstrap\NoRectorsLoadedReporter;
use Rector\Core\Configuration\Configuration;
Expand Down Expand Up @@ -153,7 +153,7 @@ private function shouldPrintMetaInformation(InputInterface $input): bool
}

$outputFormat = $input->getParameterOption(['-o', '--output-format']);
return ! in_array($outputFormat, [JsonOutputFormatter::NAME, CheckstyleOutputFormatter::NAME], true);
return $outputFormat === ConsoleOutputFormatter::NAME;
}

private function removeUnusedOptions(InputDefinition $inputDefinition): void
Expand Down