Skip to content

Issue 1362 #354

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
merged 4 commits into from
Oct 23, 2020
Merged

Issue 1362 #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5525b81
add test with invalid utf8 characters
Oct 23, 2020
7f67e25
add fix with invalid utf8 character
Oct 23, 2020
8a94dcf
Fix elipsis missing and utf-8 invalid character without external file
Oct 23, 2020
3a83385
Add test for short text invalid utf8 encoding
Oct 23, 2020
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
8 changes: 7 additions & 1 deletion src/Type/Constant/ConstantStringType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,14 @@ function (): string {
return var_export($this->value, true);
}

try {
$truncatedValue = \Nette\Utils\Strings::truncate($this->value, self::DESCRIBE_LIMIT);
} catch (\Nette\Utils\RegexpException $e) {
$truncatedValue = substr($this->value, 0, self::DESCRIBE_LIMIT) . "\u{2026}";
}

return var_export(
\Nette\Utils\Strings::truncate($this->value, self::DESCRIBE_LIMIT),
$truncatedValue,
true
);
},
Expand Down
10 changes: 10 additions & 0 deletions tests/PHPStan/Type/Constant/ConstantStringTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,14 @@ public function testGeneralize(): void
$this->assertSame('class-string', (new ConstantStringType('NonexistentClass', true))->generalize()->describe(VerbosityLevel::precise()));
}

public function testTextInvalidEncoding(): void
{
$this->assertSame("'\xc3Lorem ipsum dolor s\u{2026}'", (new ConstantStringType("\xc3Lorem ipsum dolor sit"))->describe(VerbosityLevel::value()));
}

public function testShortTextInvalidEncoding(): void
{
$this->assertSame("'\xc3Lorem ipsum dolor'", (new ConstantStringType("\xc3Lorem ipsum dolor"))->describe(VerbosityLevel::value()));
}

}