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

ValidatingArrayLoader: only validate source/dist properties if they are set (#10658)

pull/10669/head
Stephan 2022-03-26 13:40:20 +00:00 committed by GitHub
parent 61be158040
commit 1daafb817d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,10 +352,10 @@ class ValidatingArrayLoader implements LoaderInterface
if ($srcType === 'source' && !isset($this->config[$srcType]['reference'])) { if ($srcType === 'source' && !isset($this->config[$srcType]['reference'])) {
$this->errors[] = $srcType . '.reference : must be present'; $this->errors[] = $srcType . '.reference : must be present';
} }
if (!is_string($this->config[$srcType]['type'])) { if (isset($this->config[$srcType]['type']) && !is_string($this->config[$srcType]['type'])) {
$this->errors[] = $srcType . '.type : should be a string, '.gettype($this->config[$srcType]['type']).' given'; $this->errors[] = $srcType . '.type : should be a string, '.gettype($this->config[$srcType]['type']).' given';
} }
if (!is_string($this->config[$srcType]['url'])) { if (isset($this->config[$srcType]['url']) && !is_string($this->config[$srcType]['url'])) {
$this->errors[] = $srcType . '.url : should be a string, '.gettype($this->config[$srcType]['url']).' given'; $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']) && !is_int($this->config[$srcType]['reference'])) { if (isset($this->config[$srcType]['reference']) && !is_string($this->config[$srcType]['reference']) && !is_int($this->config[$srcType]['reference'])) {
@ -364,7 +364,7 @@ class ValidatingArrayLoader implements LoaderInterface
if (isset($this->config[$srcType]['reference']) && Preg::isMatch('{^\s*-}', (string) $this->config[$srcType]['reference'])) { if (isset($this->config[$srcType]['reference']) && Preg::isMatch('{^\s*-}', (string) $this->config[$srcType]['reference'])) {
$this->errors[] = $srcType . '.reference : must not start with a "-", "'.$this->config[$srcType]['reference'].'" given'; $this->errors[] = $srcType . '.reference : must not start with a "-", "'.$this->config[$srcType]['reference'].'" given';
} }
if (Preg::isMatch('{^\s*-}', $this->config[$srcType]['url'])) { if (isset($this->config[$srcType]['url']) && Preg::isMatch('{^\s*-}', (string) $this->config[$srcType]['url'])) {
$this->errors[] = $srcType . '.url : must not start with a "-", "'.$this->config[$srcType]['url'].'" given'; $this->errors[] = $srcType . '.url : must not start with a "-", "'.$this->config[$srcType]['url'].'" given';
} }
} }

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

@ -417,6 +417,20 @@ class ValidatingArrayLoaderTest extends TestCase
'require.foo/Bar : a package cannot set a require on itself', 'require.foo/Bar : a package cannot set a require on itself',
), ),
), ),
array(
array(
'name' => 'foo/bar',
'source' => array('url' => 1),
'dist' => array('url' => null),
),
array(
'source.type : must be present',
'source.url : should be a string, integer given',
'source.reference : must be present',
'dist.type : must be present',
'dist.url : must be present',
),
),
)); ));
} }