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

Don't display the dev warning time when running self-update 

Use the Application::find() method to resolve the command name, as Application::getCommandName() only returns whatever was entered as the first argument.
If the user only entered enough of the command to be unambiguous (eg self-up) then the warning would still show
By calling Application::find() we ensure that if we are going to run the self-update command then we will not show the warning, no matter what the user entered
pull/3264/head
Craig Duncan 2014-09-08 11:44:36 +01:00
parent edd4b2f984
commit b84c3f0268
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Composer/Console/Application.php
View File

@ -94,9 +94,17 @@ class Application extends BaseApplication
$output->writeln('<warning>Composer only officially supports PHP 5.3.2 and above, you will most likely encounter problems with your PHP '.PHP_VERSION.', upgrading is strongly recommended.</warning>'); $output->writeln('<warning>Composer only officially supports PHP 5.3.2 and above, you will most likely encounter problems with your PHP '.PHP_VERSION.', upgrading is strongly recommended.</warning>');
} }
if (defined('COMPOSER_DEV_WARNING_TIME') && $this->getCommandName($input) !== 'self-update' && $this->getCommandName($input) !== 'selfupdate') { if (defined('COMPOSER_DEV_WARNING_TIME')) {
if (time() > COMPOSER_DEV_WARNING_TIME) { $commandName = '';
$output->writeln(sprintf('<warning>Warning: This development build of composer is over 30 days old. It is recommended to update it by running "%s self-update" to get the latest version.</warning>', $_SERVER['PHP_SELF'])); if ($name = $this->getCommandName($input)) {
try {
$commandName = $this->find($name)->getName();
} catch (\InvalidArgumentException $e) {}
}
if ($commandName !== 'self-update' && $commandName !== 'selfupdate') {
if (time() > COMPOSER_DEV_WARNING_TIME) {
$output->writeln(sprintf('<warning>Warning: This development build of composer is over 30 days old. It is recommended to update it by running "%s self-update" to get the latest version.</warning>', $_SERVER['PHP_SELF']));
}
} }
} }