hugo
/
composer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify code

Browse Source
main
Ondřej Mirtes 3 years ago committed by GitHub
parent be58b36a35
commit 58ced29a2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File

30
src/Composer/Repository/ComposerRepository.php
Unescape Escape View File

@ -566,22 +566,20 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
} }
$packages = null; $packages = null;
if ($cacheKey) { if (!$useLastModifiedCheck && $hash && $this->cache->sha256($cacheKey) === $hash) {
if (!$useLastModifiedCheck && $hash && $this->cache->sha256($cacheKey) === $hash) { $packages = json_decode($this->cache->read($cacheKey), true);
$packages = json_decode($this->cache->read($cacheKey), true); $packagesSource = 'cached file ('.$cacheKey.' originating from '.Url::sanitize($url).')';
$packagesSource = 'cached file ('.$cacheKey.' originating from '.Url::sanitize($url).')'; } elseif ($useLastModifiedCheck) {
} elseif ($useLastModifiedCheck) { if ($contents = $this->cache->read($cacheKey)) {
if ($contents = $this->cache->read($cacheKey)) { $contents = json_decode($contents, true);
$contents = json_decode($contents, true); // we already loaded some packages from this file, so assume it is fresh and avoid fetching it again
// we already loaded some packages from this file, so assume it is fresh and avoid fetching it again if (isset($alreadyLoaded[$name])) {
if (isset($alreadyLoaded[$name])) { $packages = $contents;
$packages = $contents; $packagesSource = 'cached file ('.$cacheKey.' originating from '.Url::sanitize($url).')';
$packagesSource = 'cached file ('.$cacheKey.' originating from '.Url::sanitize($url).')'; } elseif (isset($contents['last-modified'])) {
} elseif (isset($contents['last-modified'])) { $response = $this->fetchFileIfLastModified($url, $cacheKey, $contents['last-modified']);
$response = $this->fetchFileIfLastModified($url, $cacheKey, $contents['last-modified']); $packages = true === $response ? $contents : $response;
$packages = true === $response ? $contents : $response; $packagesSource = true === $response ? 'cached file ('.$cacheKey.' originating from '.Url::sanitize($url).')' : 'downloaded file ('.Url::sanitize($url).')';
$packagesSource = true === $response ? 'cached file ('.$cacheKey.' originating from '.Url::sanitize($url).')' : 'downloaded file ('.Url::sanitize($url).')';
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save