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

Fix handling of warnings to incl all 4xx responses

pull/8081/head
Jordi Boggiano 2019-04-01 17:56:03 +02:00
parent c876613d5c
commit 625bcee63a
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Composer/Repository/ComposerRepository.php
View File

@ -700,7 +700,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
} }
$data = JsonFile::parseJson($json, $filename); $data = JsonFile::parseJson($json, $filename);
$this->outputWarnings($data); RemoteFilesystem::outputWarnings($this->io, $this->url, $data);
if ($cacheKey) { if ($cacheKey) {
if ($storeLastModifiedTime) { if ($storeLastModifiedTime) {
@ -765,7 +765,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
} }
$data = JsonFile::parseJson($json, $filename); $data = JsonFile::parseJson($json, $filename);
$this->outputWarnings($data); RemoteFilesystem::outputWarnings($this->io, $this->url, $data);
$lastModifiedDate = $rfs->findHeaderValue($rfs->getLastHeaders(), 'last-modified'); $lastModifiedDate = $rfs->findHeaderValue($rfs->getLastHeaders(), 'last-modified');
if ($lastModifiedDate) { if ($lastModifiedDate) {
@ -826,24 +826,4 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
// wipe rootData as it is fully consumed at this point and this saves some memory // wipe rootData as it is fully consumed at this point and this saves some memory
$this->rootData = true; $this->rootData = true;
} }
private function outputWarnings($data)
{
foreach (array('warning', 'info') as $type) {
if (empty($data[$type])) {
continue;
}
if (!empty($data[$type . '-versions'])) {
$versionParser = new VersionParser();
$constraint = $versionParser->parseConstraints($data[$type . '-versions']);
$composer = new Constraint('==', $versionParser->normalize(Composer::getVersion()));
if (!$constraint->matches($composer)) {
continue;
}
}
$this->io->writeError('<'.$type.'>'.ucfirst($type).' from '.$this->url.': '.$data[$type].'</'.$type.'>');
}
}
} }

40
src/Composer/Util/RemoteFilesystem.php
View File

@ -13,6 +13,9 @@
namespace Composer\Util; namespace Composer\Util;
use Composer\Config; use Composer\Config;
use Composer\Composer;
use Composer\Semver\Constraint\Constraint;
use Composer\Package\Version\VersionParser;
use Composer\IO\IOInterface; use Composer\IO\IOInterface;
use Composer\Downloader\TransportException; use Composer\Downloader\TransportException;
use Composer\CaBundle\CaBundle; use Composer\CaBundle\CaBundle;
@ -324,15 +327,12 @@ class RemoteFilesystem
if (!empty($http_response_header[0])) { if (!empty($http_response_header[0])) {
$statusCode = $this->findStatusCode($http_response_header); $statusCode = $this->findStatusCode($http_response_header);
if ($statusCode >= 400 && $this->findHeaderValue($http_response_header, 'content-type') === 'application/json') {
self::outputWarnings($this->io, $originUrl, json_decode($result, true));
}
if (in_array($statusCode, array(401, 403)) && $this->retryAuthFailure) { if (in_array($statusCode, array(401, 403)) && $this->retryAuthFailure) {
$warning = null; $this->promptAuthAndRetry($statusCode, $this->findStatusMessage($http_response_header), null, $http_response_header);
if ($this->findHeaderValue($http_response_header, 'content-type') === 'application/json') {
$data = json_decode($result, true);
if (!empty($data['warning'])) {
$warning = $data['warning'];
}
}
$this->promptAuthAndRetry($statusCode, $this->findStatusMessage($http_response_header), $warning, $http_response_header);
} }
} }
@ -741,10 +741,6 @@ class RemoteFilesystem
throw new TransportException("Invalid credentials for '" . $this->fileUrl . "', aborting.", $httpStatus); throw new TransportException("Invalid credentials for '" . $this->fileUrl . "', aborting.", $httpStatus);
} }
$this->io->overwriteError('');
if ($warning) {
$this->io->writeError(' <warning>'.$warning.'</warning>');
}
$this->io->writeError(' Authentication required (<info>'.parse_url($this->fileUrl, PHP_URL_HOST).'</info>):'); $this->io->writeError(' Authentication required (<info>'.parse_url($this->fileUrl, PHP_URL_HOST).'</info>):');
$username = $this->io->ask(' Username: '); $username = $this->io->ask(' Username: ');
$password = $this->io->askAndHideAnswer(' Password: '); $password = $this->io->askAndHideAnswer(' Password: ');
@ -1090,4 +1086,24 @@ class RemoteFilesystem
return count($pathParts) >= 4 && $pathParts[3] == 'downloads'; return count($pathParts) >= 4 && $pathParts[3] == 'downloads';
} }
public static function outputWarnings(IOInterface $io, $url, $data)
{
foreach (array('warning', 'info') as $type) {
if (empty($data[$type])) {
continue;
}
if (!empty($data[$type . '-versions'])) {
$versionParser = new VersionParser();
$constraint = $versionParser->parseConstraints($data[$type . '-versions']);
$composer = new Constraint('==', $versionParser->normalize(Composer::getVersion()));
if (!$constraint->matches($composer)) {
continue;
}
}
$io->writeError('<'.$type.'>'.ucfirst($type).' from '.$url.': '.$data[$type].'</'.$type.'>');
}
}
} }