From 3c11cde9fb88e64c3a5cf257a58cc4619ec0c8fa Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Mon, 6 Feb 2017 16:35:16 +0100
Subject: [PATCH 1/2] Include packages-dev (#282)

---
 src/Server/TextDocument.php | 2 +-
 src/Server/Workspace.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php
index 532d642..624bc67 100644
--- a/src/Server/TextDocument.php
+++ b/src/Server/TextDocument.php
@@ -412,7 +412,7 @@ class TextDocument
             if (preg_match('/\/vendor\/([^\/]+\/[^\/]+)\//', $def->symbolInformation->location->uri, $matches) && $this->composerLock !== null) {
                 // Definition is inside a dependency
                 $packageName = $matches[1];
-                foreach ($this->composerLock->packages as $package) {
+                foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) {
                     if ($package->name === $packageName) {
                         $symbol->package = $package;
                         break;
diff --git a/src/Server/Workspace.php b/src/Server/Workspace.php
index 5aae7cf..5c0e9fa 100644
--- a/src/Server/Workspace.php
+++ b/src/Server/Workspace.php
@@ -124,7 +124,7 @@ class Workspace
                     // Find out package name
                     preg_match('/\/vendor\/([^\/]+\/[^\/]+)\//', $def->symbolInformation->location->uri, $matches);
                     $packageName = $matches[1];
-                    foreach ($this->composerLock->packages as $package) {
+                    foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) {
                         if ($package->name === $packageName) {
                             $symbol->package = $package;
                             break;
@@ -165,7 +165,7 @@ class Workspace
             return [];
         }
         $dependencyReferences = [];
-        foreach ($this->composerLock->packages as $package) {
+        foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) {
             $dependencyReferences[] = new DependencyReference($package);
         }
         return $dependencyReferences;

From 571b26a0c38c17c9501b4338c2490b0142d3a39e Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Mon, 6 Feb 2017 16:42:45 +0100
Subject: [PATCH 2/2] Use php_uname() instead of PHP_OS (#283)

---
 src/Cache/FileSystemCache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cache/FileSystemCache.php b/src/Cache/FileSystemCache.php
index 8a507f7..5e9f523 100644
--- a/src/Cache/FileSystemCache.php
+++ b/src/Cache/FileSystemCache.php
@@ -18,7 +18,7 @@ class FileSystemCache implements Cache
 
     public function __construct()
     {
-        if (PHP_OS === 'WINNT') {
+        if (strtoupper(substr(php_uname('s'), 0, 3)) === 'WIN') {
             $this->cacheDir = getenv('LOCALAPPDATA') . '\\PHP Language Server\\';
         } else if (getenv('XDG_CACHE_HOME')) {
             $this->cacheDir = getenv('XDG_CACHE_HOME') . '/phpls/';