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

Make ArrayDumper and ArrayLoader reversible

pull/77/merge
Jordi Boggiano 2011-10-30 20:16:41 +01:00
parent 4904e76185
commit b100df33d8
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Downloader/DownloadManager.php
View File

@ -68,7 +68,7 @@ class DownloadManager
public function getDownloader($type)
{
if (!isset($this->downloaders[$type])) {
throw new \InvalidArgumentException('Unknown source type: '.$type);
throw new \InvalidArgumentException('Unknown downloader type: '.$type);
}
return $this->downloaders[$type];

30
src/Composer/Package/Dumper/ArrayDumper.php
View File

@ -16,6 +16,7 @@ use Composer\Package\PackageInterface;
/**
* @author Konstantin Kudryashiv <ever.zet@gmail.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
class ArrayDumper
{
@ -25,12 +26,7 @@ class ArrayDumper
'type',
'names',
'extra',
'installationSource',
'sourceType',
'sourceUrl',
'distType',
'distUrl',
'distSha1Checksum',
'installationSource' => 'installation-source',
'version',
'license',
'requires',
@ -48,8 +44,26 @@ class ArrayDumper
if ($package->getTargetDir()) {
$data['target-dir'] = $package->getTargetDir();
}
foreach ($keys as $key) {
$getter = 'get'.ucfirst($key);
if ($package->getSourceType()) {
$data['source']['type'] = $package->getSourceType();
$data['source']['url'] = $package->getSourceUrl();
$data['source']['reference'] = $package->getSourceReference();
}
if ($package->getDistType()) {
$data['dist']['type'] = $package->getDistType();
$data['dist']['url'] = $package->getDistUrl();
$data['dist']['reference'] = $package->getDistReference();
$data['dist']['shasum'] = $package->getDistSha1Checksum();
}
foreach ($keys as $method => $key) {
if (is_numeric($method)) {
$method = $key;
}
$getter = 'get'.ucfirst($method);
$value = $package->$getter();
if (null !== $value && !(is_array($value) && 0 === count($value))) {

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

@ -73,6 +73,10 @@ class ArrayLoader
$package->setLicense($config['license']);
}
if (isset($config['installation-source'])) {
$package->setInstallationSource($config['installation-source']);
}
if (isset($config['source'])) {
if (!isset($config['source']['type']) || !isset($config['source']['url'])) {
throw new \UnexpectedValueException(sprintf(