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

Merge branch '2.2' into main

pull/10737/head
Jordi Boggiano 2022-04-14 16:26:21 +02:00
parent 1f6f4a786e 20d11bfdfb
commit 2d153f2371
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/SelfUpdateCommand.php
View File

@ -103,7 +103,7 @@ EOT
foreach (Versions::CHANNELS as $channel) { foreach (Versions::CHANNELS as $channel) {
if ($input->getOption($channel)) { if ($input->getOption($channel)) {
$requestedChannel = $channel; $requestedChannel = $channel;
$versionsUtil->setChannel($channel); $versionsUtil->setChannel($channel, $io);
break; break;
} }
} }

12
src/Composer/SelfUpdate/Versions.php
View File

@ -12,6 +12,7 @@
namespace Composer\SelfUpdate; namespace Composer\SelfUpdate;
use Composer\IO\IOInterface;
use Composer\Pcre\Preg; use Composer\Pcre\Preg;
use Composer\Util\HttpDownloader; use Composer\Util\HttpDownloader;
use Composer\Config; use Composer\Config;
@ -69,7 +70,7 @@ class Versions
* *
* @return void * @return void
*/ */
public function setChannel(string $channel): void public function setChannel(string $channel, IOInterface $io = null): void
{ {
if (!in_array($channel, self::$channels, true)) { if (!in_array($channel, self::$channels, true)) {
throw new \InvalidArgumentException('Invalid channel '.$channel.', must be one of: ' . implode(', ', self::$channels)); throw new \InvalidArgumentException('Invalid channel '.$channel.', must be one of: ' . implode(', ', self::$channels));
@ -77,8 +78,15 @@ class Versions
$channelFile = $this->config->get('home').'/update-channel'; $channelFile = $this->config->get('home').'/update-channel';
$this->channel = $channel; $this->channel = $channel;
$storedChannel = Preg::isMatch('{^\d+$}D', $channel) ? 'stable' : $channel;
$previouslyStored = file_exists($channelFile) ? trim((string) file_get_contents($channelFile)) : null;
// rewrite '2' and '1' channels to stable for future self-updates, but LTS ones like '2.2' remain pinned // rewrite '2' and '1' channels to stable for future self-updates, but LTS ones like '2.2' remain pinned
file_put_contents($channelFile, (Preg::isMatch('{^\d+$}D', $channel) ? 'stable' : $channel).PHP_EOL); file_put_contents($channelFile, $storedChannel.PHP_EOL);
if ($io !== null && $previouslyStored !== $storedChannel) {
$io->writeError('Storing "<info>'.$storedChannel.'</info>" as default update channel for the next self-update run.');
}
} }
/** /**