Переглянути джерело

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

Allow unicode keywords, fixes #4087
Jordi Boggiano 10 роки тому
батько
коміт
22369266e4

+ 1 - 1
src/Composer/Package/Loader/ValidatingArrayLoader.php

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

+ 1 - 1
tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php

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