Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 13 Packages Wiki Activity Actions

Minor correction in curl handling

Browse source
This commit is contained in:
Netkas 2023-10-04 14:41:23 -04:00
parent d5e28d1f45
commit cf7e1aa107
No known key found for this signature in database
GPG key ID: 5DAF58535614062B
1 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/ncc/Classes/PackagistExtension/PackagistRepository.php
View file

@ -56,26 +56,30 @@
$version = self::resolveVersion($repository, $vendor, $project, $version); $version = self::resolveVersion($repository, $vendor, $project, $version);
$endpoint = sprintf('%s://%s/packages/%s/%s.json', ($repository->isSsl() ? 'https' : 'http'), $repository->getHost(), rawurlencode($vendor), rawurlencode($project)); $endpoint = sprintf('%s://%s/packages/%s/%s.json', ($repository->isSsl() ? 'https' : 'http'), $repository->getHost(), rawurlencode($vendor), rawurlencode($project));
if(RuntimeCache::exists($endpoint))
{
return RuntimeCache::get($endpoint);
}
Console::outDebug(sprintf('Fetching archive %s/%s version %s from %s', $vendor, $project, $version, $endpoint)); Console::outDebug(sprintf('Fetching archive %s/%s version %s from %s', $vendor, $project, $version, $endpoint));
$curl = curl_init($endpoint); if(RuntimeCache::exists($endpoint))
$headers = [ {
'Accept: application/json', $response = RuntimeCache::get($endpoint);
'User-Agent: ncc' }
]; else
{
$curl = curl_init($endpoint);
$headers = [
'Accept: application/json',
'User-Agent: ncc'
];
curl_setopt_array($curl, [ curl_setopt_array($curl, [
CURLOPT_RETURNTRANSFER => true, CURLOPT_RETURNTRANSFER => true,
CURLOPT_CUSTOMREQUEST => HttpRequestType::GET, CURLOPT_CUSTOMREQUEST => HttpRequestType::GET,
CURLOPT_HTTPHEADER => $headers CURLOPT_HTTPHEADER => $headers
]); ]);
$response = self::processHttpResponse($curl, $vendor, $project); $response = self::processHttpResponse($curl, $vendor, $project);
RuntimeCache::set($endpoint, $response);
unset($curl);
}
if(!isset($response['package']['versions'][$version])) if(!isset($response['package']['versions'][$version]))
{ {
@ -87,10 +91,7 @@
throw new NetworkException(sprintf('Invalid response from %s/%s, version %s does not have a dist URL', $vendor, $project, $version)); throw new NetworkException(sprintf('Invalid response from %s/%s, version %s does not have a dist URL', $vendor, $project, $version));
} }
$result = new RepositoryResult($response['package']['versions'][$version]['dist']['url'], RepositoryResultType::SOURCE, $version); return new RepositoryResult($response['package']['versions'][$version]['dist']['url'], RepositoryResultType::SOURCE, $version);
RuntimeCache::set($endpoint, $result);
return $result;
} }
/** /**
@ -119,34 +120,33 @@
if(RuntimeCache::exists($endpoint)) if(RuntimeCache::exists($endpoint))
{ {
return RuntimeCache::get($endpoint); $response = RuntimeCache::get($endpoint);
} }
else
{
$curl = curl_init($endpoint);
$headers = [
'Accept: application/json',
'User-Agent: ncc'
];
$curl = curl_init($endpoint); curl_setopt_array($curl, [
$headers = [ CURLOPT_RETURNTRANSFER => true,
'Accept: application/json', CURLOPT_CUSTOMREQUEST => HttpRequestType::GET,
'User-Agent: ncc' CURLOPT_HTTPHEADER => $headers
]; ]);
Console::outDebug(sprintf('Fetching %s/%s versions from %s', $vendor, $project, $endpoint)); $response = self::processHttpResponse($curl, $vendor, $project);
RuntimeCache::set($endpoint, $response);
curl_setopt_array($curl, [ unset($curl);
CURLOPT_RETURNTRANSFER => true, }
CURLOPT_CUSTOMREQUEST => HttpRequestType::GET,
CURLOPT_HTTPHEADER => $headers
]);
$response = self::processHttpResponse($curl, $vendor, $project);
if(!isset($response['package']['versions'])) if(!isset($response['package']['versions']))
{ {
throw new NetworkException(sprintf('Invalid response from %s/%s, missing "package.versions" key', $vendor, $project)); throw new NetworkException(sprintf('Invalid response from %s/%s, missing "package.versions" key', $vendor, $project));
} }
$result = array_keys($response['package']['versions']); return array_keys($response['package']['versions']);
RuntimeCache::set($endpoint, $result);
return $result;
} }
/** /**