From 731feda79432f076145bdfa5ef904fce113fd726 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sat, 19 Apr 2025 11:46:41 +0200 Subject: [PATCH 1/4] TableErrorFormatter: visually differentiate phpstan assertion errors from rule errors --- src/Command/ErrorFormatter/TableErrorFormatter.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Command/ErrorFormatter/TableErrorFormatter.php b/src/Command/ErrorFormatter/TableErrorFormatter.php index 7da56bdff1..134130773f 100644 --- a/src/Command/ErrorFormatter/TableErrorFormatter.php +++ b/src/Command/ErrorFormatter/TableErrorFormatter.php @@ -13,6 +13,7 @@ use function count; use function explode; use function getenv; +use function in_array; use function is_string; use function ltrim; use function sprintf; @@ -117,6 +118,11 @@ public function formatErrors( $message .= "\n✏️ ' . $title . ''; } + + if (in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable'], true)) { + $message = '' . $message . ''; + } + $rows[] = [ $this->formatLineNumber($error->getLine()), $message, From b3464013e83c2c472e25d1ea6870d4c271153dd5 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sat, 19 Apr 2025 11:52:26 +0200 Subject: [PATCH 2/4] Update TableErrorFormatter.php --- src/Command/ErrorFormatter/TableErrorFormatter.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Command/ErrorFormatter/TableErrorFormatter.php b/src/Command/ErrorFormatter/TableErrorFormatter.php index 134130773f..e655acfca4 100644 --- a/src/Command/ErrorFormatter/TableErrorFormatter.php +++ b/src/Command/ErrorFormatter/TableErrorFormatter.php @@ -119,7 +119,10 @@ public function formatErrors( $message .= "\n✏️ ' . $title . ''; } - if (in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable'], true)) { + if ( + $error->getIdentifier() !== null + && in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable'], true) + ) { $message = '' . $message . ''; } From fb50821a7da1698ceafca0c766de558e89590d29 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sat, 19 Apr 2025 15:46:08 +0200 Subject: [PATCH 3/4] Update TableErrorFormatter.php --- src/Command/ErrorFormatter/TableErrorFormatter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Command/ErrorFormatter/TableErrorFormatter.php b/src/Command/ErrorFormatter/TableErrorFormatter.php index e655acfca4..2f66cc20df 100644 --- a/src/Command/ErrorFormatter/TableErrorFormatter.php +++ b/src/Command/ErrorFormatter/TableErrorFormatter.php @@ -121,9 +121,9 @@ public function formatErrors( if ( $error->getIdentifier() !== null - && in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable'], true) + && in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable', 'phpstan.dumpType', 'phpstan.unknownExpectation'], true) ) { - $message = '' . $message . ''; + $message = '' . $message . ''; } $rows[] = [ From 5e54cc47f8245c306f32881febae07deb0dc6f79 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 21 Apr 2025 08:03:28 +0200 Subject: [PATCH 4/4] use red text only --- src/Command/ErrorFormatter/TableErrorFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Command/ErrorFormatter/TableErrorFormatter.php b/src/Command/ErrorFormatter/TableErrorFormatter.php index 2f66cc20df..dc0ce7e244 100644 --- a/src/Command/ErrorFormatter/TableErrorFormatter.php +++ b/src/Command/ErrorFormatter/TableErrorFormatter.php @@ -123,7 +123,7 @@ public function formatErrors( $error->getIdentifier() !== null && in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable', 'phpstan.dumpType', 'phpstan.unknownExpectation'], true) ) { - $message = '' . $message . ''; + $message = '' . $message . ''; } $rows[] = [