From 06f460c557172ce59699570c38eb6d53cc2d41cc Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 11 Mar 2020 21:32:55 +0100 Subject: [PATCH] Remove trailing spaces from output --- src/Composer/DependencyResolver/Problem.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Composer/DependencyResolver/Problem.php b/src/Composer/DependencyResolver/Problem.php index a68d45b40..5f22914cc 100644 --- a/src/Composer/DependencyResolver/Problem.php +++ b/src/Composer/DependencyResolver/Problem.php @@ -251,12 +251,13 @@ class Problem if ($providers = $repositorySet->getProvidersAndReplacers($packageName)) { $maxProviders = 20; $providersStr = implode(array_map(function ($p) { - return " - ${p['name']} ".substr($p['description'], 0, 100)."\n"; + $description = $p['description'] ? ' '.substr($p['description'], 0, 100) : ''; + return " - ${p['name']}".$description."\n"; }, count($providers) > $maxProviders+1 ? array_slice($providers, 0, $maxProviders) : $providers)); if (count($providers) > $maxProviders+1) { $providersStr .= ' ... and '.(count($providers)-$maxProviders).' more.'."\n"; } - return array("- Root composer.json requires $packageName".self::constraintToText($constraint).", it ", "could not be found in any version, but the following packages provide it: \n".$providersStr." Consider requiring one of these to satisfy the $packageName requirement."); + return array("- Root composer.json requires $packageName".self::constraintToText($constraint).", it ", "could not be found in any version, but the following packages provide it:\n".$providersStr." Consider requiring one of these to satisfy the $packageName requirement."); } return array("- Root composer.json requires $packageName, it ", "could not be found in any version, there may be a typo in the package name.");