From bae4f357447f9f8ab8263ec6b44381a1b93e7641 Mon Sep 17 00:00:00 2001 From: Xiaohui Lam Date: Mon, 12 Nov 2018 02:08:19 +0800 Subject: [PATCH] Update Indexer.php --- src/Indexer.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Indexer.php b/src/Indexer.php index 553524c..258b43e 100644 --- a/src/Indexer.php +++ b/src/Indexer.php @@ -152,12 +152,16 @@ class Indexer // Dynamic constraints are not cached, because they can change every time $packageVersion = ltrim($package->version, 'v'); if ($package->name === $packageName) { - $packageKey = $packageName . ':' . $packageVersion; if (strpos($packageVersion, 'dev') !== false) { - $packageKey = $packageName . ':' . (isset($package->source) && isset($package->source->reference) ? - $package->source->reference : (isset($package->dist) && isset($package->dist->reference) ? - $package->source->reference : $packageVersion)); + if (isset($package->source) && isset($package->source->reference)) { + $packageVersion = $package->source->reference; + } else { + if (isset($package->dist) && isset($package->dist->reference)) { + $packageVersion = $package->source->reference; + } + } } + $packageKey = $packageName . ':' . $packageVersion; $cacheKey = self::CACHE_VERSION . ':' . $packageKey; // Check cache $index = yield $this->cache->get($cacheKey);