From 3931c8848ff4b5696501d26cad165520cca813a8 Mon Sep 17 00:00:00 2001
From: janekcz69 <janekcz69@gmail.com>
Date: Wed, 22 Aug 2018 20:48:14 +0200
Subject: [PATCH] fix: cast null to array before passing to array_merge()
 (#666)

Fixes #595
---
 src/Indexer.php          | 2 +-
 src/Server/Workspace.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Indexer.php b/src/Indexer.php
index a556d4d..85d1787 100644
--- a/src/Indexer.php
+++ b/src/Indexer.php
@@ -147,7 +147,7 @@ class Indexer
                 $packageKey = null;
                 $cacheKey = null;
                 $index = null;
-                foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) {
+                foreach (array_merge($this->composerLock->packages, (array)$this->composerLock->{'packages-dev'}) as $package) {
                     // Check if package name matches and version is absolute
                     // Dynamic constraints are not cached, because they can change every time
                     $packageVersion = ltrim($package->version, 'v');
diff --git a/src/Server/Workspace.php b/src/Server/Workspace.php
index 082c502..548197b 100644
--- a/src/Server/Workspace.php
+++ b/src/Server/Workspace.php
@@ -169,7 +169,7 @@ class Workspace
             return [];
         }
         $dependencyReferences = [];
-        foreach (array_merge($this->composerLock->packages, $this->composerLock->{'packages-dev'}) as $package) {
+        foreach (array_merge($this->composerLock->packages, (array)$this->composerLock->{'packages-dev'}) as $package) {
             $dependencyReferences[] = new DependencyReference($package);
         }
         return $dependencyReferences;