icedream
/
php-language-server
1
0
Fork 0
Code Releases Activity

Refactor duplicate check for package name, fix syntax violation

pull/367/head
John S Long 2017-04-29 23:11:49 -05:00
parent 9438724f28
commit 929ea30724
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Indexer.php
View File

@ -149,10 +149,13 @@ class Indexer
$cacheKey = null; $cacheKey = null;
$index = null; $index = null;
foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) { foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) {
if ($package->name !== $packageName) {
continue;
}
// Check if package can be cached. // Check if package can be cached.
$packageVersion = ltrim($package->version, 'v'); $packageVersion = ltrim($package->version, 'v');
// If package is anchored to a version // If package is anchored to a version
if ($package->name === $packageName && strpos($packageVersion, 'dev') === false) { if (strpos($packageVersion, 'dev') === false) {
$packageKey = $packageName . ':' . $packageVersion; $packageKey = $packageName . ':' . $packageVersion;
$cacheKey = self::CACHE_VERSION . ':' . $packageKey; $cacheKey = self::CACHE_VERSION . ':' . $packageKey;
// Check cache // Check cache
@ -160,7 +163,7 @@ class Indexer
break; break;
// If package is checked out // If package is checked out
} elseif ($package->name === $packageName && isset($package->source->reference)) { } else if (isset($package->source->reference)) {
$packageKey = $packageName . ':' . $package->source->reference; $packageKey = $packageName . ':' . $package->source->reference;
$cacheKey = self::CACHE_VERSION . ':' . $packageKey; $cacheKey = self::CACHE_VERSION . ':' . $packageKey;
// Check cache // Check cache