Fix for issue #5631
- Add " ( and ) as valid characters in author name - Add relavent unit testspull/5645/head
parent
ed78253c58
commit
ac41bb0615
|
@ -320,7 +320,7 @@ EOT
|
|||
*/
|
||||
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<email>.+?)>$/u', $author, $match)) {
|
||||
if ($this->isValidEmail($match['email'])) {
|
||||
return array(
|
||||
'name' => trim($match['name']),
|
||||
|
|
|
@ -17,6 +17,7 @@ use Composer\TestCase;
|
|||
|
||||
class InitCommandTest extends TestCase
|
||||
{
|
||||
|
||||
public function testParseValidAuthorString()
|
||||
{
|
||||
$command = new InitCommand;
|
||||
|
@ -40,6 +41,32 @@ class InitCommandTest extends TestCase
|
|||
$this->assertEquals('h4x0r', $author['name']);
|
||||
$this->assertEquals('h4x@example.com', $author['email']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test scenario for issue #5631
|
||||
* @link https://github.com/composer/composer/issues/5631 Issue #5631
|
||||
*/
|
||||
public function testParseValidAlias1AuthorString()
|
||||
{
|
||||
$command = new InitCommand;
|
||||
$author = $command->parseAuthorString(
|
||||
'Johnathon "Johnny" Smith <john@example.com>');
|
||||
$this->assertEquals('Johnathon "Johnny" Smith', $author['name'] );
|
||||
$this->assertEquals('john@example.com', $author['email']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test scenario for issue #5631
|
||||
* @link https://github.com/composer/composer/issues/5631 Issue #5631
|
||||
*/
|
||||
public function testParseValidAlias2AuthorString()
|
||||
{
|
||||
$command = new InitCommand;
|
||||
$author = $command->parseAuthorString(
|
||||
'Johnathon (Johnny) Smith <john@example.com>');
|
||||
$this->assertEquals('Johnathon (Johnny) Smith', $author['name'] );
|
||||
$this->assertEquals('john@example.com', $author['email']);
|
||||
}
|
||||
|
||||
public function testParseEmptyAuthorString()
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue