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

Merge pull request #4097 from alcohol/allow-unicode-keywords 

Allow unicode keywords, fixes #4087
pull/3186/merge
Jordi Boggiano 2015-06-02 14:19:31 +01:00
parent d4dbeeacc4 0f04f97088
commit 22369266e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Loader/ValidatingArrayLoader.php
View File

@ -70,7 +70,7 @@ class ValidatingArrayLoader implements LoaderInterface
$this->validateArray('scripts'); // TODO validate event names & listener syntax $this->validateArray('scripts'); // TODO validate event names & listener syntax
$this->validateString('description'); $this->validateString('description');
$this->validateUrl('homepage'); $this->validateUrl('homepage');
$this->validateFlatArray('keywords', '[A-Za-z0-9 ._-]+'); $this->validateFlatArray('keywords', '[\p{N}\p{L} ._-]+');
if (isset($this->config['license'])) { if (isset($this->config['license'])) {
if (is_string($this->config['license'])) { if (is_string($this->config['license'])) {

2
tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php
View File

@ -47,7 +47,7 @@ class ValidatingArrayLoaderTest extends \PHPUnit_Framework_TestCase
'description' => 'Foo bar', 'description' => 'Foo bar',
'version' => '1.0.0', 'version' => '1.0.0',
'type' => 'library', 'type' => 'library',
'keywords' => array('a', 'b_c', 'D E'), 'keywords' => array('a', 'b_c', 'D E', 'éîüø', '微信'),
'homepage' => 'https://foo.com', 'homepage' => 'https://foo.com',
'time' => '2010-10-10T10:10:10+00:00', 'time' => '2010-10-10T10:10:10+00:00',
'license' => 'MIT', 'license' => 'MIT',