浏览代码

Only show override description if there is one, refs #7011

Jordi Boggiano 7 年之前
父节点
当前提交
766ed9555e
共有 1 个文件被更改,包括 8 次插入5 次删除
  1. 8 5
      src/Composer/DependencyResolver/Problem.php

+ 8 - 5
src/Composer/DependencyResolver/Problem.php

@@ -91,15 +91,18 @@ class Problem
 
 
                 // handle php/hhvm
                 // handle php/hhvm
                 if ($job['packageName'] === 'php' || $job['packageName'] === 'php-64bit' || $job['packageName'] === 'hhvm') {
                 if ($job['packageName'] === 'php' || $job['packageName'] === 'php-64bit' || $job['packageName'] === 'hhvm') {
+                    $version = phpversion();
                     $available = $this->pool->whatProvides($job['packageName']);
                     $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 ';
                     $msg = "\n    - This package requires ".$job['packageName'].$this->constraintToText($job['constraint']).' but ';
 
 
                     if (defined('HHVM_VERSION')) {
                     if (defined('HHVM_VERSION')) {