From 3bbe3306fc5aa6e7d11a5cc4480b607d4b9c35b7 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Sun, 11 Dec 2011 23:31:53 +0100 Subject: [PATCH 1/2] Correctly dump link info --- src/Composer/Package/Dumper/ArrayDumper.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Composer/Package/Dumper/ArrayDumper.php b/src/Composer/Package/Dumper/ArrayDumper.php index c944813a3..1ce256502 100644 --- a/src/Composer/Package/Dumper/ArrayDumper.php +++ b/src/Composer/Package/Dumper/ArrayDumper.php @@ -28,12 +28,6 @@ class ArrayDumper 'extra', 'installationSource' => 'installation-source', 'license', - 'requires', - 'conflicts', - 'provides', - 'replaces', - 'recommends', - 'suggests', 'autoload', 'repositories', ); @@ -59,6 +53,13 @@ class ArrayDumper $data['dist']['shasum'] = $package->getDistSha1Checksum(); } + foreach (array('require', 'conflict', 'provide', 'replace', 'suggest', 'recommend') as $linkType) { + if ($links = $package->{'get'.ucfirst($linkType).'s'}()) { + foreach ($links as $link) + $data[$linkType][$link->getTarget()] = $link->getPrettyConstraint(); + } + } + foreach ($keys as $method => $key) { if (is_numeric($method)) { $method = $key; From 737fe32f4db91582724555c3fe91289da9b8c713 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Mon, 12 Dec 2011 12:51:42 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Use=20{}=A0for=20foreach?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Composer/Package/Dumper/ArrayDumper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Composer/Package/Dumper/ArrayDumper.php b/src/Composer/Package/Dumper/ArrayDumper.php index 1ce256502..1c4283855 100644 --- a/src/Composer/Package/Dumper/ArrayDumper.php +++ b/src/Composer/Package/Dumper/ArrayDumper.php @@ -55,8 +55,9 @@ class ArrayDumper foreach (array('require', 'conflict', 'provide', 'replace', 'suggest', 'recommend') as $linkType) { if ($links = $package->{'get'.ucfirst($linkType).'s'}()) { - foreach ($links as $link) + foreach ($links as $link) { $data[$linkType][$link->getTarget()] = $link->getPrettyConstraint(); + } } }