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

ArrayLoader: assert that source/dist reference are string values (#10647)

pull/10656/head
Stephan 2022-03-22 08:48:51 +00:00 committed by GitHub
parent 166542f981
commit 61be158040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -185,7 +185,7 @@ class ArrayLoader implements LoaderInterface
} }
$package->setSourceType($config['source']['type']); $package->setSourceType($config['source']['type']);
$package->setSourceUrl($config['source']['url']); $package->setSourceUrl($config['source']['url']);
$package->setSourceReference($config['source']['reference'] ?? null); $package->setSourceReference(isset($config['source']['reference']) ? (string) $config['source']['reference'] : null);
if (isset($config['source']['mirrors'])) { if (isset($config['source']['mirrors'])) {
$package->setSourceMirrors($config['source']['mirrors']); $package->setSourceMirrors($config['source']['mirrors']);
} }
@ -202,7 +202,7 @@ class ArrayLoader implements LoaderInterface
} }
$package->setDistType($config['dist']['type']); $package->setDistType($config['dist']['type']);
$package->setDistUrl($config['dist']['url']); $package->setDistUrl($config['dist']['url']);
$package->setDistReference($config['dist']['reference'] ?? null); $package->setDistReference(isset($config['dist']['reference']) ? (string) $config['dist']['reference'] : null);
$package->setDistSha1Checksum($config['dist']['shasum'] ?? null); $package->setDistSha1Checksum($config['dist']['shasum'] ?? null);
if (isset($config['dist']['mirrors'])) { if (isset($config['dist']['mirrors'])) {
$package->setDistMirrors($config['dist']['mirrors']); $package->setDistMirrors($config['dist']['mirrors']);

22
tests/Composer/Test/Package/Loader/ArrayLoaderTest.php
View File

@ -325,4 +325,26 @@ class ArrayLoaderTest extends TestCase
$package = $this->loader->load($config); $package = $this->loader->load($config);
$this->assertSame('1', $package->getPrettyVersion()); $this->assertSame('1', $package->getPrettyVersion());
} }
public function testNoneStringSourceDistReference(): void
{
$config = array(
'name' => 'acme/package',
'version' => 'dev-main',
'source' => [
'type' => 'svn',
'url' => 'https://example.org/',
'reference' => 2019,
],
'dist' => [
'type' => 'zip',
'url' => 'https://example.org/',
'reference' => 2019,
],
);
$package = $this->loader->load($config);
$this->assertSame('2019', $package->getSourceReference());
$this->assertSame('2019', $package->getDistReference());
}
} }