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

Add basic source/dist validation

pull/9855/head
Jordi Boggiano 2021-04-28 21:53:09 +02:00
parent 40c7a725e1
commit 832af78e28
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,8 +306,34 @@ class ValidatingArrayLoader implements LoaderInterface
unset($this->config['autoload']['psr-4']); unset($this->config['autoload']['psr-4']);
} }
// TODO validate dist foreach (array('source', 'dist') as $srcType) {
// TODO validate source if ($this->validateArray($srcType) && !empty($this->config[$srcType])) {
if (!isset($this->config[$srcType]['type'])) {
$this->errors[] = $srcType . '.type : must be present';
}
if (!isset($this->config[$srcType]['url'])) {
$this->errors[] = $srcType . '.url : must be present';
}
if ($srcType === 'source' && !isset($this->config[$srcType]['reference'])) {
$this->errors[] = $srcType . '.reference : must be present';
}
if (!is_string($this->config[$srcType]['type'])) {
$this->errors[] = $srcType . '.type : should be a string, '.gettype($this->config[$srcType]['type']).' given';
}
if (!is_string($this->config[$srcType]['url'])) {
$this->errors[] = $srcType . '.url : should be a string, '.gettype($this->config[$srcType]['url']).' given';
}
if (isset($this->config[$srcType]['reference']) && !is_string($this->config[$srcType]['reference'])) {
$this->errors[] = $srcType . '.reference : should be a string, '.gettype($this->config[$srcType]['reference']).' given';
}
if (isset($this->config[$srcType]['reference']) && preg_match('{^\s*-}', $this->config[$srcType]['reference'])) {
$this->errors[] = $srcType . '.reference : must not start with a "-", "'.$this->config[$srcType]['reference'].'" given';
}
if (preg_match('{^\s*-}', $this->config[$srcType]['url'])) {
$this->errors[] = $srcType . '.url : must not start with a "-", "'.$this->config[$srcType]['url'].'" given';
}
}
}
// TODO validate repositories // TODO validate repositories
// TODO validate package repositories' packages using this recursively // TODO validate package repositories' packages using this recursively

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

@ -322,6 +322,19 @@ class ValidatingArrayLoaderTest extends TestCase
'transport-options : should be an array, string given', 'transport-options : should be an array, string given',
), ),
), ),
array(
array(
'name' => 'foo/bar',
'source' => array('url' => '--foo', 'reference' => ' --bar', 'type' => 'baz'),
'dist' => array('url' => ' --foox', 'reference' => '--barx', 'type' => 'baz'),
),
array(
'dist.reference : must not start with a "-", "--barx" given',
'dist.url : must not start with a "-", " --foox" given',
'source.reference : must not start with a "-", " --bar" given',
'source.url : must not start with a "-", "--foo" given',
),
),
)); ));
} }