From 369c2ff552685b6e65fea7fa2cb96cc54d9c879c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A4nz=20Friederes?= Date: Mon, 5 Oct 2020 20:52:21 +0200 Subject: [PATCH] Implement PR code style feedback --- src/Composer/Downloader/FileDownloader.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php index 3729b1f95..7d44142d7 100644 --- a/src/Composer/Downloader/FileDownloader.php +++ b/src/Composer/Downloader/FileDownloader.php @@ -106,8 +106,9 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface throw new \InvalidArgumentException('The given package is missing url information'); } - $generateCacheKey = function (PackageInterface $package, $key) { + $cacheKeyGenerator = function (PackageInterface $package, $key) { $cacheKey = sha1($key); + return $package->getName().'/'.$cacheKey.'.'.$package->getDistType(); }; @@ -122,7 +123,7 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface // from different packages, which would potentially allow a given package // in a third party repo to pre-populate the cache for the same package in // packagist for example. - 'cacheKey' => $generateCacheKey($package, $processedUrl) + 'cacheKey' => $cacheKeyGenerator($package, $processedUrl) ); } @@ -139,16 +140,16 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface $accept = null; $reject = null; - $download = function () use ($io, $output, $httpDownloader, $cache, $generateCacheKey, $eventDispatcher, $package, $fileName, &$urls, &$accept, &$reject) { + $download = function () use ($io, $output, $httpDownloader, $cache, $cacheKeyGenerator, $eventDispatcher, $package, $fileName, &$urls, &$accept, &$reject) { $url = reset($urls); if ($eventDispatcher) { $preFileDownloadEvent = new PreFileDownloadEvent(PluginEvents::PRE_FILE_DOWNLOAD, $httpDownloader, $url['processed'], 'package', $package); $eventDispatcher->dispatch($preFileDownloadEvent->getName(), $preFileDownloadEvent); if ($preFileDownloadEvent->getCustomCacheKey() !== null) { - $url['cacheKey'] = $generateCacheKey($package, $preFileDownloadEvent->getCustomCacheKey()); + $url['cacheKey'] = $cacheKeyGenerator($package, $preFileDownloadEvent->getCustomCacheKey()); } else if ($preFileDownloadEvent->getProcessedUrl() !== $url['processed']) { - $url['cacheKey'] = $generateCacheKey($package, $preFileDownloadEvent->getProcessedUrl()); + $url['cacheKey'] = $cacheKeyGenerator($package, $preFileDownloadEvent->getProcessedUrl()); } $url['processed'] = $preFileDownloadEvent->getProcessedUrl(); }