diff --git a/src/Psalm/Internal/Analyzer/IssueData.php b/src/Psalm/Internal/Analyzer/IssueData.php index fa38f4fc1cc..4db99befce1 100644 --- a/src/Psalm/Internal/Analyzer/IssueData.php +++ b/src/Psalm/Internal/Analyzer/IssueData.php @@ -119,7 +119,7 @@ class IssueData * @var ?string * @readonly */ - private $dupe_key; + public $dupe_key; /** * @param ?list $taint_trace @@ -166,9 +166,4 @@ public function __construct( $this->taint_trace = $taint_trace; $this->dupe_key = $dupe_key; } - - public function getDupeKey() : ?string - { - return $this->dupe_key; - } } diff --git a/src/Psalm/IssueBuffer.php b/src/Psalm/IssueBuffer.php index da024297d7b..b7b147afb4c 100644 --- a/src/Psalm/IssueBuffer.php +++ b/src/Psalm/IssueBuffer.php @@ -412,7 +412,7 @@ public static function addIssues(array $issues_data): void . '-' . $issue->file_name . ':' . $issue->line_from . ':' . $issue->column_from - . ' ' . $issue->getDupeKey(); + . ' ' . $issue->dupe_key; if (!self::alreadyEmitted($emitted_key)) { self::$issues_data[$file_path][] = $issue; diff --git a/src/Psalm/Report/JsonReport.php b/src/Psalm/Report/JsonReport.php index f867058e26e..fdca5b25dde 100644 --- a/src/Psalm/Report/JsonReport.php +++ b/src/Psalm/Report/JsonReport.php @@ -13,6 +13,15 @@ public function create(): string { $options = $this->pretty ? Json::PRETTY : Json::DEFAULT; - return Json::encode(array_values($this->issues_data), $options) . "\n"; + $issues_data = \array_map( + function ($issue_data): array { + $issue_data = (array) $issue_data; + unset($issue_data['dupe_key']); + return $issue_data; + }, + $this->issues_data + ); + + return Json::encode(array_values($issues_data), $options) . "\n"; } } diff --git a/src/Psalm/Report/XmlReport.php b/src/Psalm/Report/XmlReport.php index 86b0b946445..24cc6fc2687 100644 --- a/src/Psalm/Report/XmlReport.php +++ b/src/Psalm/Report/XmlReport.php @@ -15,7 +15,9 @@ public function create(): string [ 'item' => array_map( function (IssueData $issue_data): array { - return (array) $issue_data; + $issue_data = (array) $issue_data; + unset($issue_data['dupe_key']); + return $issue_data; }, $this->issues_data )