public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #6270 from twoixter/fix-init-command-unicode 

Fix Init command to accept author names with Unicode combining marks
pull/6281/head
Jordi Boggiano 2017-03-17 21:56:30 +01:00 committed by GitHub
parent a68c6f61ec b2f62bc06c
commit e2b827de46
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/InitCommand.php
View File

@ -320,7 +320,7 @@ EOT
*/ */
public function parseAuthorString($author) public function parseAuthorString($author)
{ {
if (preg_match('/^(?P<name>[- .,\p{L}\p{N}\'’"()]+) <(?P<email>.+?)>$/u', $author, $match)) { if (preg_match('/^(?P<name>[- .,\p{L}\p{N}\p{Mn}\'’"()]+) <(?P<email>.+?)>$/u', $author, $match)) {
if ($this->isValidEmail($match['email'])) { if ($this->isValidEmail($match['email'])) {
return array( return array(
'name' => trim($match['name']), 'name' => trim($match['name']),

10
tests/Composer/Test/Command/InitCommandTest.php
View File

@ -33,6 +33,16 @@ class InitCommandTest extends TestCase
$this->assertEquals('matti@example.com', $author['email']); $this->assertEquals('matti@example.com', $author['email']);
} }
public function testParseValidUtf8AuthorStringWithNonSpacingMarks()
{
// \xCC\x88 is UTF-8 for U+0308 diaeresis (umlaut) combining mark
$utf8_expected = "Matti Meika\xCC\x88la\xCC\x88inen";
$command = new InitCommand;
$author = $command->parseAuthorString($utf8_expected." <matti@example.com>");
$this->assertEquals($utf8_expected, $author['name']);
$this->assertEquals('matti@example.com', $author['email']);
}
public function testParseNumericAuthorString() public function testParseNumericAuthorString()
{ {
$command = new InitCommand; $command = new InitCommand;