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

Make RemoteFilesystem::getRemoteContents() report response headers also on exceptions

pull/7495/head
Nicolas Grekas 2018-07-26 17:31:40 +02:00
parent 9bc578e24a
commit a3bbcf9c77
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,7 @@ class RemoteFilesystem
$errorMessage .= preg_replace('{^file_get_contents\(.*?\): }', '', $msg); $errorMessage .= preg_replace('{^file_get_contents\(.*?\): }', '', $msg);
}); });
try { try {
list($http_response_header, $result) = $this->getRemoteContents($originUrl, $fileUrl, $ctx); $result = $this->getRemoteContents($originUrl, $fileUrl, $ctx, $http_response_header);
if (!empty($http_response_header[0])) { if (!empty($http_response_header[0])) {
$statusCode = $this->findStatusCode($http_response_header); $statusCode = $this->findStatusCode($http_response_header);
@ -577,13 +577,24 @@ class RemoteFilesystem
* @param string $fileUrl The file URL * @param string $fileUrl The file URL
* @param resource $context The stream context * @param resource $context The stream context
* *
* @return array The response headers and the contents * @return string|false The response contents or false on failure
*/ */
protected function getRemoteContents($originUrl, $fileUrl, $context) protected function getRemoteContents($originUrl, $fileUrl, $context, array &$responseHeaders = null)
{ {
$contents = file_get_contents($fileUrl, false, $context); try {
$e = null;
$result = file_get_contents($fileUrl, false, $context);
} catch (\Throwable $e) {
} catch (\Exception $e) {
}
return array(isset($http_response_header) ? $http_response_header : null, $contents); $responseHeaders = isset($http_response_header) ? $http_response_header : array();
if (null !== $e) {
throw $e;
}
return $result;
} }
/** /**