Skip to content

Fixed PHPStan formatter and replace deprecated config nodes #32215

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
mmansoor-magento merged 2 commits into from
Feb 18, 2021
Merged

Fixed PHPStan formatter and replace deprecated config nodes #32215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b92cd0
magento/magento2#31176: Fixed phpstan errorFormatter and deprecated a…
sivaschenko Feb 18, 2021
841b172
magento/magento2#31176: Updated AnalysisResult constructor arguments
sivaschenko Feb 18, 2021
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
Prev Previous commit
#31176: Updated AnalysisResult constructor arguments
  • Loading branch information
@sivaschenko
sivaschenko committed Feb 18, 2021
commit 841b172312c4293b24bac8fde014c091008c2310
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"pdepend/pdepend": "~2.7.1",
"phpcompatibility/php-compatibility": "^9.3",
"phpmd/phpmd": "^2.8.0",
"phpstan/phpstan": "^0.12.3",
"phpstan/phpstan": "^0.12.77",
"phpunit/phpunit": "^9",
"sebastian/phpcpd": "~5.0.0",
"squizlabs/php_codesniffer": "~3.5.4"
Expand Down
12 changes: 6 additions & 6 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@
class FilteredErrorFormatter implements ErrorFormatter
{
private const MUTE_ERROR_ANNOTATION = 'phpstan:ignore';

private const NO_ERRORS = 0;

/**
* @var TableErrorFormatter
*/
private $tableErrorFormatter;

/**
Expand All @@ -60,22 +62,18 @@ public function __construct(TableErrorFormatter $tableErrorFormatter)
public function formatErrors(AnalysisResult $analysisResult, Output $output): int
{
if (!$analysisResult->hasErrors()) {
$style = $output->getStyle();
$style->success('No errors');
$output->getStyle()->success('No errors');
return self::NO_ERRORS;
}

$fileSpecificErrorsWithoutIgnoredErrors = $this->clearIgnoredErrors(
$analysisResult->getFileSpecificErrors()
);

$clearedAnalysisResult = new AnalysisResult(
$fileSpecificErrorsWithoutIgnoredErrors,
$this->clearIgnoredErrors($analysisResult->getFileSpecificErrors()),
$analysisResult->getNotFileSpecificErrors(),
$analysisResult->getInternalErrors(),
$analysisResult->getWarnings(),
$analysisResult->isDefaultLevelUsed(),
$analysisResult->hasInferrablePropertyTypesFromConstructor(),
$analysisResult->getProjectConfigFile()
$analysisResult->getProjectConfigFile(),
$analysisResult->isResultCacheSaved()
);

return $this->tableErrorFormatter->formatErrors($clearedAnalysisResult, $output);
Expand Down