danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Allow IssueBuffer::remove to remove recorded issues

Browse Source
This commit is contained in:
adrew 2021-12-13 01:00:32 +03:00
parent 2a570fb94f
commit de0d3a3be3
3 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Psalm/Issue/CodeIssue.php
View File

@ -86,20 +86,23 @@ abstract class CodeIssue
return $this->message;
}
public static function getIssueType(): string
{
$fqcn_parts = explode('\\', static::class);
return array_pop($fqcn_parts);
}
public function toIssueData(string $severity): IssueData
{
$location = $this->code_location;
$selection_bounds = $location->getSelectionBounds();
$snippet_bounds = $location->getSnippetBounds();
$fqcn_parts = explode('\\', static::class);
$issue_type = array_pop($fqcn_parts);
return new IssueData(
$severity,
$location->getLineNumber(),
$location->getEndLineNumber(),
$issue_type,
static::getIssueType(),
$this->message,
$location->file_name,
$location->file_path,

20
src/Psalm/IssueBuffer.php
View File

@ -326,11 +326,31 @@ class IssueBuffer
return true;
}
private static function removeRecordedIssue(string $issue_type, int $file_offset): void
{
$recorded_issues = self::$recorded_issues[self::$recording_level];
$filtered_issues = [];
foreach ($recorded_issues as $issue) {
[$from] = $issue->code_location->getSelectionBounds();
if ($issue::getIssueType() !== $issue_type || $from !== $file_offset) {
$filtered_issues[] = $issue;
}
}
self::$recorded_issues[self::$recording_level] = $filtered_issues;
}
/**
* This will try to remove an issue that has been added for emission
*/
public static function remove(string $file_path, string $issue_type, int $file_offset): void
{
if (self::$recording_level > 0) {
self::removeRecordedIssue($issue_type, $file_offset);
}
if (!isset(self::$issues_data[$file_path])) {
return;
}

23
tests/Loop/ForeachTest.php
View File

@ -430,6 +430,29 @@ class ForeachTest extends TestCase
'MixedAssignment',
],
],
'noMixedAssigmentWithIfAssertion' => [
'<?php
$object = new stdClass();
$reflection = new ReflectionClass($object);
foreach ($reflection->getProperties() as $property) {
$message = $property->getValue($reflection->newInstance());
if (!is_string($message)) {
throw new RuntimeException();
}
}',
],
'noMixedAssigmentWithAssertion' => [
'<?php
$object = new stdClass();
$reflection = new ReflectionClass($object);
foreach ($reflection->getProperties() as $property) {
$message = $property->getValue($reflection->newInstance());
assert(is_string($message));
}',
],
'nullToMixedWithNullCheckAndContinue' => [
'<?php
$a = null;