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

Merge pull request #535 from fixe/writing_lock_file_message 

"Writing lock file" message is only displayed if locker isn't fresh
pull/539/head
Jordi Boggiano 2012-04-06 14:06:27 -07:00
parent fc1a7a3e23 13839bf52c
commit a6e686b29e
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Installer.php
View File

@ -305,8 +305,9 @@ class Installer
if (!$this->dryRun) {
if ($this->update || !$this->locker->isLocked()) {
$this->locker->setLockData($localRepo->getPackages(), $aliases);
$this->io->write('<info>Writing lock file</info>');
if ($this->locker->setLockData($localRepo->getPackages(), $aliases)) {
$this->io->write('<info>Writing lock file</info>');
}
}
$localRepo->write();

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

@ -121,6 +121,8 @@ class Locker
*
* @param array $packages array of packages
* @param array $aliases array of aliases
*
* @return Boolean
*/
public function setLockData(array $packages, array $aliases)
{
@ -129,6 +131,7 @@ class Locker
'packages' => array(),
'aliases' => $aliases,
);
foreach ($packages as $package) {
$name = $package->getPrettyName();
$version = $package->getPrettyVersion();
@ -144,19 +147,25 @@ class Locker
if ($package->isDev()) {
$spec['source-reference'] = $package->getSourceReference();
}
if ($package->getAlias() && $package->isInstalledAsAlias()) {
$spec['alias'] = $package->getAlias();
}
$lock['packages'][] = $spec;
}
usort($lock['packages'], function ($a, $b) {
return strcmp($a['package'], $b['package']);
});
$this->lockFile->write($lock);
if ($lock !== $this->getLockData()) {
$this->lockFile->write($lock);
$this->lockDataCache = null;
// invalidate cache
$this->lockDataCache = null;
return true;
}
return false;
}
}