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

Fix type errors in key updating logic

pull/11353/head
Jordi Boggiano 2023-02-24 17:41:47 +01:00
parent b0a110f164
commit 1ff942bb44
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,6 +369,7 @@ TAGSPUBKEY
$io->write('Open <info>https://composer.github.io/pubkeys.html</info> to find the latest keys'); $io->write('Open <info>https://composer.github.io/pubkeys.html</info> to find the latest keys');
$validator = static function ($value): string { $validator = static function ($value): string {
$value = (string) $value;
if (!Preg::isMatch('{^-----BEGIN PUBLIC KEY-----$}', trim($value))) { if (!Preg::isMatch('{^-----BEGIN PUBLIC KEY-----$}', trim($value))) {
throw new \UnexpectedValueException('Invalid input'); throw new \UnexpectedValueException('Invalid input');
} }
@ -379,7 +380,7 @@ TAGSPUBKEY
$devKey = ''; $devKey = '';
while (!Preg::isMatch('{(-----BEGIN PUBLIC KEY-----.+?-----END PUBLIC KEY-----)}s', $devKey, $match)) { while (!Preg::isMatch('{(-----BEGIN PUBLIC KEY-----.+?-----END PUBLIC KEY-----)}s', $devKey, $match)) {
$devKey = $io->askAndValidate('Enter Dev / Snapshot Public Key (including lines with -----): ', $validator); $devKey = $io->askAndValidate('Enter Dev / Snapshot Public Key (including lines with -----): ', $validator);
while ($line = $io->ask('')) { while ($line = $io->ask('', '')) {
$devKey .= trim($line)."\n"; $devKey .= trim($line)."\n";
if (trim($line) === '-----END PUBLIC KEY-----') { if (trim($line) === '-----END PUBLIC KEY-----') {
break; break;
@ -392,7 +393,7 @@ TAGSPUBKEY
$tagsKey = ''; $tagsKey = '';
while (!Preg::isMatch('{(-----BEGIN PUBLIC KEY-----.+?-----END PUBLIC KEY-----)}s', $tagsKey, $match)) { while (!Preg::isMatch('{(-----BEGIN PUBLIC KEY-----.+?-----END PUBLIC KEY-----)}s', $tagsKey, $match)) {
$tagsKey = $io->askAndValidate('Enter Tags Public Key (including lines with -----): ', $validator); $tagsKey = $io->askAndValidate('Enter Tags Public Key (including lines with -----): ', $validator);
while ($line = $io->ask('')) { while ($line = $io->ask('', '')) {
$tagsKey .= trim($line)."\n"; $tagsKey .= trim($line)."\n";
if (trim($line) === '-----END PUBLIC KEY-----') { if (trim($line) === '-----END PUBLIC KEY-----') {
break; break;