1
0
Fork 0

Merge pull request #8793 from cebe/naming-pattern-json-schema

Add package naming pattern to the composer.json JSON schema
pull/8790/head
Jordi Boggiano 2020-04-15 16:36:24 +02:00 committed by GitHub
commit bd5952c7ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions

View File

@ -7,7 +7,8 @@
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string",
"description": "Package name, including 'vendor-name/' prefix." "description": "Package name, including 'vendor-name/' prefix.",
"pattern": "^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]?|-{0,2})[a-z0-9]+)*$"
}, },
"type": { "type": {
"description": "Package type, either 'library' for common packages, 'composer-plugin' for plugins, 'metapackage' for empty packages, or a custom type ([a-z0-9-]+) defined by whatever project this package applies to.", "description": "Package type, either 'library' for common packages, 'composer-plugin' for plugins, 'metapackage' for empty packages, or a custom type ([a-z0-9-]+) defined by whatever project this package applies to.",

View File

@ -20,6 +20,23 @@ use Composer\Test\TestCase;
*/ */
class ComposerSchemaTest extends TestCase class ComposerSchemaTest extends TestCase
{ {
public function testNamePattern()
{
$expectedError = array(
array(
'property' => 'name',
'message' => 'Does not match the regex pattern ^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]?|-{0,2})[a-z0-9]+)*$',
'constraint' => 'pattern',
'pattern' => '^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]?|-{0,2})[a-z0-9]+)*$'
),
);
$json = '{"name": "vendor/-pack__age", "description": "description"}';
$this->assertEquals($expectedError, $this->check($json));
$json = '{"name": "Vendor/Package", "description": "description"}';
$this->assertEquals($expectedError, $this->check($json));
}
public function testRequiredProperties() public function testRequiredProperties()
{ {
$json = '{ }'; $json = '{ }';
@ -41,13 +58,13 @@ class ComposerSchemaTest extends TestCase
public function testOptionalAbandonedProperty() public function testOptionalAbandonedProperty()
{ {
$json = '{"name": "name", "description": "description", "abandoned": true}'; $json = '{"name": "vendor/package", "description": "description", "abandoned": true}';
$this->assertTrue($this->check($json)); $this->assertTrue($this->check($json));
} }
public function testRequireTypes() public function testRequireTypes()
{ {
$json = '{"name": "name", "description": "description", "require": {"a": ["b"]} }'; $json = '{"name": "vendor/package", "description": "description", "require": {"a": ["b"]} }';
$this->assertEquals(array( $this->assertEquals(array(
array('property' => 'require.a', 'message' => 'Array value found, but a string is required', 'constraint' => 'type'), array('property' => 'require.a', 'message' => 'Array value found, but a string is required', 'constraint' => 'type'),
), $this->check($json)); ), $this->check($json));