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

Fix forcing of the source-ref from lock file

pull/329/head
Jordi Boggiano 2012-02-19 16:34:35 +01:00
parent 4233a4823d
commit c95b4d05fd
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Command/InstallCommand.php
View File

@ -236,9 +236,11 @@ EOT
$package = $operation->getPackage(); $package = $operation->getPackage();
} }
if ($package && $package->isDev()) { if ($package && $package->isDev()) {
foreach ($composer->getLocker()->getLockedPackages() as $lockedPackage) { $lockData = $composer->getLocker()->getLockData();
foreach ($lockData['packages'] as $lockedPackage) {
if (!empty($lockedPackage['source-reference']) && strtolower($lockedPackage['package']) === $package->getName()) { if (!empty($lockedPackage['source-reference']) && strtolower($lockedPackage['package']) === $package->getName()) {
$package->setSourceReference($lockedPackage['source-reference']); $package->setSourceReference($lockedPackage['source-reference']);
break;
} }
} }
} }

15
src/Composer/Package/Locker.php
View File

@ -69,11 +69,7 @@ class Locker
*/ */
public function getLockedPackages() public function getLockedPackages()
{ {
if (!$this->isLocked()) { $lockList = $this->getLockData();
throw new \LogicException('No lockfile found. Unable to read locked packages');
}
$lockList = $this->lockFile->read();
$packages = array(); $packages = array();
foreach ($lockList['packages'] as $info) { foreach ($lockList['packages'] as $info) {
$package = $this->repositoryManager->getLocalRepository()->findPackage($info['package'], $info['version']); $package = $this->repositoryManager->getLocalRepository()->findPackage($info['package'], $info['version']);
@ -95,6 +91,15 @@ class Locker
return $packages; return $packages;
} }
public function getLockData()
{
if (!$this->isLocked()) {
throw new \LogicException('No lockfile found. Unable to read locked packages');
}
return $this->lockFile->read();
}
/** /**
* Locks provided packages into lockfile. * Locks provided packages into lockfile.
* *