From 0b4763e6c721672014a603ca000165661cf98a4b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 4 Feb 2020 13:06:20 +0100 Subject: [PATCH] Make it clear which package the error is for when detecting uncommitted changes --- src/Composer/Downloader/GitDownloader.php | 2 +- src/Composer/Downloader/SvnDownloader.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php index 1d4ebe4b6..483a3d364 100644 --- a/src/Composer/Downloader/GitDownloader.php +++ b/src/Composer/Downloader/GitDownloader.php @@ -301,7 +301,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface $changes = array_map(function ($elem) { return ' '.$elem; }, preg_split('{\s*\r?\n\s*}', $changes)); - $this->io->writeError(' The package has modified files:'); + $this->io->writeError(' '.$package->getPrettyName().' has modified files:'); $this->io->writeError(array_slice($changes, 0, 10)); if (count($changes) > 10) { $this->io->writeError(' ' . (count($changes) - 10) . ' more files modified, choose "v" to view the full list'); diff --git a/src/Composer/Downloader/SvnDownloader.php b/src/Composer/Downloader/SvnDownloader.php index 47263c28a..b6ff41295 100644 --- a/src/Composer/Downloader/SvnDownloader.php +++ b/src/Composer/Downloader/SvnDownloader.php @@ -109,7 +109,7 @@ class SvnDownloader extends VcsDownloader return $util->execute($command, $url, $cwd, $path, $this->io->isVerbose()); } catch (\RuntimeException $e) { throw new \RuntimeException( - 'Package could not be downloaded, '.$e->getMessage() + $package->getPrettyName().' could not be downloaded, '.$e->getMessage() ); } } @@ -135,7 +135,7 @@ class SvnDownloader extends VcsDownloader return ' '.$elem; }, preg_split('{\s*\r?\n\s*}', $changes)); $countChanges = count($changes); - $this->io->writeError(sprintf(' The package has modified file%s:', $countChanges === 1 ? '' : 's')); + $this->io->writeError(sprintf(' '.$package->getPrettyName().' has modified file%s:', $countChanges === 1 ? '' : 's')); $this->io->writeError(array_slice($changes, 0, 10)); if ($countChanges > 10) { $remainingChanges = $countChanges - 10;