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

Show overridden php version in diagnose command, fixes #7497

pull/7501/head
Jordi Boggiano 2018-07-27 10:59:36 +02:00
parent 35389f1cc2
commit de6432f5f0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Command/DiagnoseCommand.php
View File

@ -16,6 +16,7 @@ use Composer\Composer;
use Composer\Factory; use Composer\Factory;
use Composer\Config; use Composer\Config;
use Composer\Downloader\TransportException; use Composer\Downloader\TransportException;
use Composer\Repository\PlatformRepository;
use Composer\Plugin\CommandEvent; use Composer\Plugin\CommandEvent;
use Composer\Plugin\PluginEvents; use Composer\Plugin\PluginEvents;
use Composer\Util\ConfigValidator; use Composer\Util\ConfigValidator;
@ -153,7 +154,15 @@ EOT
$io->write(sprintf('Composer version: <comment>%s</comment>', Composer::VERSION)); $io->write(sprintf('Composer version: <comment>%s</comment>', Composer::VERSION));
$io->write(sprintf('PHP version: <comment>%s</comment>', PHP_VERSION)); $platformOverrides = $config->get('platform') ?: array();
$platformRepo = new PlatformRepository(array(), $platformOverrides);
$phpPkg = $platformRepo->findPackage('php', '*');
$phpVersion = $phpPkg->getPrettyVersion();
if (false !== strpos($phpPkg->getDescription(), 'overridden')) {
$phpVersion .= ' - ' . $phpPkg->getDescription();
}
$io->write(sprintf('PHP version: <comment>%s</comment>', $phpVersion));
if (defined('PHP_BINARY')) { if (defined('PHP_BINARY')) {
$io->write(sprintf('PHP binary path: <comment>%s</comment>', PHP_BINARY)); $io->write(sprintf('PHP binary path: <comment>%s</comment>', PHP_BINARY));