From 42739e7959d81f38e0e41ab7ae96e5db88c0411d Mon Sep 17 00:00:00 2001 From: Rafael Kassner Date: Sun, 29 Jul 2018 16:12:58 +0200 Subject: [PATCH] Do not dump source and dist for metapackages --- src/Composer/Package/Dumper/ArrayDumper.php | 4 +- .../Test/Package/Dumper/ArrayDumperTest.php | 51 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/Composer/Package/Dumper/ArrayDumper.php b/src/Composer/Package/Dumper/ArrayDumper.php index 6593143d5..ab8b4d45b 100644 --- a/src/Composer/Package/Dumper/ArrayDumper.php +++ b/src/Composer/Package/Dumper/ArrayDumper.php @@ -45,7 +45,7 @@ class ArrayDumper $data['target-dir'] = $package->getTargetDir(); } - if ($package->getSourceType()) { + if ($package->getSourceType() && $package->getType() !== 'metapackage') { $data['source']['type'] = $package->getSourceType(); $data['source']['url'] = $package->getSourceUrl(); $data['source']['reference'] = $package->getSourceReference(); @@ -54,7 +54,7 @@ class ArrayDumper } } - if ($package->getDistType()) { + if ($package->getDistType() && $package->getType() !== 'metapackage') { $data['dist']['type'] = $package->getDistType(); $data['dist']['url'] = $package->getDistUrl(); $data['dist']['reference'] = $package->getDistReference(); diff --git a/tests/Composer/Test/Package/Dumper/ArrayDumperTest.php b/tests/Composer/Test/Package/Dumper/ArrayDumperTest.php index bd1c29c13..9b12e49a9 100644 --- a/tests/Composer/Test/Package/Dumper/ArrayDumperTest.php +++ b/tests/Composer/Test/Package/Dumper/ArrayDumperTest.php @@ -106,6 +106,57 @@ class ArrayDumperTest extends TestCase $this->assertSame($expectedValue ?: $value, $config[$key]); } + public function testMetapackageShouldNotHaveSourceEntries() + { + $this + ->packageExpects('getPrettyName', 'foo') + ->packageExpects('getPrettyVersion', '1.0') + ->packageExpects('getVersion', '1.0.0.0') + ->packageExpects('getType', 'metapackage') + ->packageExpects('getSourceType', 'composer') + ->packageExpects('getSourceUrl', 'https://packagist.org') + ->packageExpects('getSourceReference', 'packagist') + ; + + $config = $this->dumper->dump($this->package); + + $this->assertEquals( + array( + 'name' => 'foo', + 'version' => '1.0', + 'version_normalized' => '1.0.0.0', + 'type' => 'metapackage', + ), + $config + ); + } + + public function testMetapackageShouldNotHaveDistEntries() + { + $this + ->packageExpects('getPrettyName', 'foo') + ->packageExpects('getPrettyVersion', '1.0') + ->packageExpects('getVersion', '1.0.0.0') + ->packageExpects('getType', 'metapackage') + ->packageExpects('getDistType', 'composer') + ->packageExpects('getDistUrl', 'https://packagist.org') + ->packageExpects('getDistReference', 'packagist') + ->packageExpects('getDistSha1Checksum', 'packagist') + ; + + $config = $this->dumper->dump($this->package); + + $this->assertEquals( + array( + 'name' => 'foo', + 'version' => '1.0', + 'version_normalized' => '1.0.0.0', + 'type' => 'metapackage', + ), + $config + ); + } + public function getKeys() { return array(