From 766ed9555e21ca6cd3019a69b14311279889e304 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 24 Jan 2018 09:02:51 +0100 Subject: [PATCH] Only show override description if there is one, refs #7011 --- src/Composer/DependencyResolver/Problem.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Composer/DependencyResolver/Problem.php b/src/Composer/DependencyResolver/Problem.php index 7fa40641b..debc8678c 100644 --- a/src/Composer/DependencyResolver/Problem.php +++ b/src/Composer/DependencyResolver/Problem.php @@ -91,15 +91,18 @@ class Problem // handle php/hhvm if ($job['packageName'] === 'php' || $job['packageName'] === 'php-64bit' || $job['packageName'] === 'hhvm') { + $version = phpversion(); $available = $this->pool->whatProvides($job['packageName']); - $firstAvailable = reset($available); - $version = count($available) ? $firstAvailable->getPrettyVersion() : phpversion(); - if (count($available) && $firstAvailable instanceof CompletePackageInterface) { - $version .= '; ' . $firstAvailable->getDescription(); + if (count($available)) { + $firstAvailable = reset($available); + $version = $firstAvailable->getPrettyVersion(); + $extra = $firstAvailable->getExtra(); + if ($firstAvailable instanceof CompletePackageInterface && isset($extra['config.platform']) && $extra['config.platform'] === true) { + $version .= '; ' . $firstAvailable->getDescription(); + } } - $msg = "\n - This package requires ".$job['packageName'].$this->constraintToText($job['constraint']).' but '; if (defined('HHVM_VERSION')) {