From 4e667f891b7bea0550b83c5cf1aa087a3736bb5c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 13 Jan 2020 13:45:04 +0100 Subject: [PATCH 1/2] Fix 5.3 build --- tests/Composer/Test/Util/ProcessExecutorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Composer/Test/Util/ProcessExecutorTest.php b/tests/Composer/Test/Util/ProcessExecutorTest.php index 29723b4a5..63ed0b7de 100644 --- a/tests/Composer/Test/Util/ProcessExecutorTest.php +++ b/tests/Composer/Test/Util/ProcessExecutorTest.php @@ -108,7 +108,7 @@ class ProcessExecutorTest extends TestCase public function testConsoleIODoesNotFormatSymfonyConsoleStyle() { $output = new BufferedOutput(OutputInterface::VERBOSITY_NORMAL, true); - $process = new ProcessExecutor(new ConsoleIO(new ArrayInput([]), $output, new HelperSet([]))); + $process = new ProcessExecutor(new ConsoleIO(new ArrayInput(array()), $output, new HelperSet(array()))); $process->execute('echo \'foo\''); $this->assertSame('foo'.PHP_EOL, $output->fetch()); From ef6ef8ac0fcbb4c2c45202d87a791b63b5528f97 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 13 Jan 2020 14:19:37 +0100 Subject: [PATCH 2/2] Hint at the partial update command, fixes #8508, refs #8332 --- src/Composer/Command/ValidateCommand.php | 2 +- src/Composer/Installer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Command/ValidateCommand.php b/src/Composer/Command/ValidateCommand.php index 5aba74adf..7ec15ccb9 100644 --- a/src/Composer/Command/ValidateCommand.php +++ b/src/Composer/Command/ValidateCommand.php @@ -93,7 +93,7 @@ EOT $composer = Factory::create($io, $file, $input->hasParameterOption('--no-plugins')); $locker = $composer->getLocker(); if ($locker->isLocked() && !$locker->isFresh()) { - $lockErrors[] = 'The lock file is not up to date with the latest changes in composer.json, it is recommended that you run `composer update`.'; + $lockErrors[] = 'The lock file is not up to date with the latest changes in composer.json, it is recommended that you run `composer update` or `composer update `.'; } $this->outputResult($io, $file, $errors, $warnings, $checkPublish, $publishErrors, $checkLock, $lockErrors, true, $isStrict); diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 11edcbe72..e00b3817a 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -447,7 +447,7 @@ class Installer $this->io->writeError('Installing dependencies'.($this->devMode ? ' (including require-dev)' : '').' from lock file'); if (!$this->locker->isFresh()) { - $this->io->writeError('Warning: The lock file is not up to date with the latest changes in composer.json. You may be getting outdated dependencies. Run update to update them.', true, IOInterface::QUIET); + $this->io->writeError('Warning: The lock file is not up to date with the latest changes in composer.json. You may be getting outdated dependencies. It is recommended that you run `composer update` or `composer update `.', true, IOInterface::QUIET); } foreach ($lockedRepository->getPackages() as $package) {