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

compare references when using dists

pull/1050/head
Mateusz Heleniak 2012-08-31 23:27:36 +02:00
parent aa0ff14be5
commit 6489487245
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Installer.php
View File

@ -388,7 +388,12 @@ class Installer
break; break;
} }
} }
if (isset($lockedReference) && $lockedReference !== $package->getSourceReference()) { $sourceReference = $package->getSourceReference() ?: $package->getDistReference();
if (isset($lockedReference) && $lockedReference !== $sourceReference) {
if (!$package->getSourceType() && $package->getDistType()) {
throw new \RuntimeException(sprintf('Dist reference (%s) does not match locked reference (%s)', $sourceReference, $lockedReference));
}
// changing the source ref to update to will be handled in the operations loop below // changing the source ref to update to will be handled in the operations loop below
$operations[] = new UpdateOperation($package, clone $package); $operations[] = new UpdateOperation($package, clone $package);
} }

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

@ -232,7 +232,7 @@ class Locker
$spec = array('package' => $name, 'version' => $version); $spec = array('package' => $name, 'version' => $version);
if ($package->isDev() && !$alias) { if ($package->isDev() && !$alias) {
$spec['source-reference'] = $package->getSourceReference(); $spec['source-reference'] = $package->getSourceReference() ?: $package->getDistReference();
if ('git' === $package->getSourceType() && $path = $this->installationManager->getInstallPath($package)) { if ('git' === $package->getSourceType() && $path = $this->installationManager->getInstallPath($package)) {
$process = new ProcessExecutor(); $process = new ProcessExecutor();
if (0 === $process->execute('git log -n1 --pretty=%ct '.escapeshellarg($package->getSourceReference()), $output, $path)) { if (0 === $process->execute('git log -n1 --pretty=%ct '.escapeshellarg($package->getSourceReference()), $output, $path)) {