Skip to content

[Validator] Add encoding test to validateClassName #387

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 1 commit into from
Jun 1, 2019
Merged

[Validator] Add encoding test to validateClassName #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ public static function validateClassName(string $className, string $errorMessage
];

foreach ($pieces as $piece) {
if (!mb_check_encoding($piece, 'UTF-8')) {
$errorMessage = $errorMessage ?: sprintf('"%s" is not a UTF-8-encoded string.', $piece);

throw new RuntimeCommandException($errorMessage);
}

if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $piece)) {
$errorMessage = $errorMessage ?: sprintf('"%s" is not valid as a PHP class name (it must start with a letter or underscore, followed by any number of letters, numbers, or underscores)', $className);

Expand Down
7 changes: 7 additions & 0 deletions tests/ValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,11 @@ public function testInvalidClassName()
$this->expectExceptionMessage('"Class" is a reserved keyword and thus cannot be used as class name in PHP.');
Validator::validateClassName('App\Entity\Class');
}

public function testInvalidEncodingInClassName()
{
$this->expectException(RuntimeCommandException::class);
$this->expectExceptionMessage('"�Controller" is not a UTF-8-encoded string.');
Validator::validateClassName(mb_convert_encoding('Ś', 'ISO-8859-2', 'UTF-8'));
}
}