Merge branch 'master' into master

.npmrc

@@ -1 +0,0 @@
-package-lock=false

.travis.yml

@@ -41,13 +41,11 @@ jobs:
       services:
         - docker
       install:
-        - composer install --prefer-dist --no-interaction
         - nvm install 8
         - nvm use 8
         - npm install
       script:
-        - docker build -t felixfbecker/php-language-server .
+        - ./node_modules/.bin/semantic-release
-        - npm run semantic-release
 
 stages:
   - test

README.md

@@ -4,7 +4,6 @@
 [![Linux Build Status](https://travis-ci.org/felixfbecker/php-language-server.svg?branch=master)](https://travis-ci.org/felixfbecker/php-language-server)
 [![Windows Build status](https://ci.appveyor.com/api/projects/status/2sp5ll052wdjqmdm/branch/master?svg=true)](https://ci.appveyor.com/project/felixfbecker/php-language-server/branch/master)
 [![Coverage](https://codecov.io/gh/felixfbecker/php-language-server/branch/master/graph/badge.svg)](https://codecov.io/gh/felixfbecker/php-language-server)
-[![Dependency Status](https://gemnasium.com/badges/github.com/felixfbecker/php-language-server.svg)](https://gemnasium.com/github.com/felixfbecker/php-language-server)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.0-8892BF.svg)](https://php.net/)
 [![License](https://img.shields.io/packagist/l/felixfbecker/language-server.svg)](https://github.com/felixfbecker/php-language-server/blob/master/LICENSE.txt)
@@ -17,6 +16,16 @@ Uses the great [Tolerant PHP Parser](https://github.com/Microsoft/tolerant-php-p
 [phpDocumentor's DocBlock reflection](https://github.com/phpDocumentor/ReflectionDocBlock)
 and an [event loop](http://sabre.io/event/loop/) for concurrency.
 
+**Table of Contents**
+  - [Features](#features)
+  - [Performance](#performance)
+  - [Versioning](#versioning)
+  - [Installation](#installation)
+  - [Running](#running)
+  - [Used by](#used-by)
+  - [Contributing](#contributing)
+
+
 ## Features
 
 ### [Completion](https://github.com/Microsoft/language-server-protocol/blob/master/protocol.md#textDocument_completion)

package.json

@@ -1,31 +1,25 @@
 {
-  "name": "php-language-server",
-  "version": "0.0.0-development",
   "private": true,
-  "scripts": {
+  "repository": {
-    "commitmsg": "validate-commit-msg",
+    "type": "git",
-    "semantic-release": "semantic-release"
+    "url": "https://github.com/felixfbecker/php-language-server.git"
   },
   "devDependencies": {
-    "@semantic-release/github": "^2.0.0",
+    "@semantic-release/exec": "^3.1.0",
-    "@semantic-release/last-release-git-tag": "^2.0.0",
+    "semantic-release": "^15.9.9",
-    "cz-conventional-changelog": "^2.0.0",
+    "semantic-release-docker": "^2.1.0"
-    "husky": "^0.14.3",
-    "semantic-release": "^11.0.0",
-    "semantic-release-docker": "^2.0.0",
-    "validate-commit-msg": "^2.14.0"
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
-    }
   },
   "release": {
     "verifyConditions": [
       "@semantic-release/github",
       "semantic-release-docker"
     ],
-    "getLastRelease": "@semantic-release/last-release-git-tag",
+    "prepare": [
+      {
+        "path": "@semantic-release/exec",
+        "cmd": "composer install --prefer-dist --no-interaction && docker build -t felixfbecker/php-language-server ."
+      }
+    ],
     "publish": [
       "@semantic-release/github",
       {
@@ -33,9 +27,5 @@
         "name": "felixfbecker/php-language-server"
       }
     ]
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/felixfbecker/php-language-server.git"
   }
 }

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');

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;