build: fix package-lock.json

PHP 7.0 reached end of life: https://www.php.net/supported-versions.php

Fixes #447

.gitignore

@@ -2,4 +2,3 @@ node_modules/
 out/
 vendor/
 .DS_Store
-package-lock.json

.npmrc

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

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - '7.0'
+  - '7.1'
 
 cache:
   directories:
@@ -9,11 +9,11 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - nvm install 8
+  - nvm install '12.4.0'
-  - nvm use 8
+  - nvm use '12.4.0'
 
 install:
-  - npm install
+  - npm ci
 
 script:
   - npm run lint
@@ -23,9 +23,9 @@ jobs:
   include:
     - stage: test
     - stage: release
-      php: '7.0'
+      php: '7.1'
       install:
-        - npm install
+        - npm ci
         - composer install --prefer-dist --no-interaction --optimize-autoloader
       script:
         - npm run build

.vscodeignore

@@ -5,6 +5,7 @@ images/**
 out/test/**
 src/**
 vendor/jetbrains/phpstorm-stubs/**
+!vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php
 vendor/bin/**
 **/.DS_Store
 **/.editorconfig

composer.json

@@ -3,7 +3,7 @@
     "prefer-stable": true,
     "config": {
         "platform": {
-            "php": "7.0.25"
+            "php": "7.1.0"
         }
     },
     "require": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6ed459a7ca4ebd4f2b24f3881ca1d1d0",
+    "content-hash": "9c2828a729b23a2d11872a4acf98a8e5",
     "packages": [
         {
             "name": "composer/xdebug-handler",
@@ -343,35 +343,33 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "~6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
+                    "phpDocumentor\\Reflection\\": "src/"
-                        "src"
-                    ]
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -393,7 +391,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "time": "2018-08-07T13:53:10+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -448,30 +446,31 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.5.1",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae"
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/cf842904952e64e703800d094cdf34e715a8a3ae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
-                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae",
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": "^7.1",
-                "phpdocumentor/reflection-common": "^1.0"
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^1.0",
+                "ext-tokenizer": "^7.1",
-                "phpunit/phpunit": "^6.4"
+                "mockery/mockery": "~1",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -489,7 +488,8 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-12-30T13:23:38+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "time": "2019-08-22T18:11:29+00:00"
         },
         {
             "name": "psr/log",
@@ -859,6 +859,6 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.0.25"
+        "php": "7.1.0"
     }
 }

package.json

@@ -59,7 +59,7 @@
     "@types/mocha": "5.2.7",
     "@types/mz": "0.0.32",
     "@types/node": "8.10.29",
-    "@types/semver": "5.5.0",
+    "@types/semver": "6.2.0",
     "husky": "1.1.3",
     "prettier": "1.15.3",
     "semantic-release": "15.10.8",
@@ -72,7 +72,7 @@
   "dependencies": {
     "execa": "1.0.0",
     "mz": "2.7.0",
-    "semver": "5.6.0",
+    "semver": "6.3.0",
     "vscode-languageclient": "5.1.1"
   },
   "commitlint": {

src/extension.ts

@@ -5,7 +5,8 @@ import * as path from 'path'
 import * as semver from 'semver'
 import * as url from 'url'
 import * as vscode from 'vscode'
-import { LanguageClient, LanguageClientOptions, StreamInfo } from 'vscode-languageclient'
+import { LanguageClient, LanguageClientOptions, RevealOutputChannelOn, StreamInfo } from 'vscode-languageclient'
+const composerJson = require('../composer.json')
 
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
     const conf = vscode.workspace.getConfiguration('php')
@@ -58,8 +59,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     if (!/^\d+.\d+.\d+$/.test(version)) {
         version = version.replace(/(\d+.\d+.\d+)/, '$1-')
     }
-    if (semver.lt(version, '7.0.0')) {
+    if (semver.lt(version, composerJson.config.platform.php)) {
-        vscode.window.showErrorMessage('The language server needs at least PHP 7 installed. Version found: ' + version)
+        vscode.window.showErrorMessage('The language server needs at least PHP 7.1 installed. Version found: ' + version)
         return
     }
 
@@ -111,6 +112,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     const clientOptions: LanguageClientOptions = {
         // Register the server for php documents
         documentSelector: [{ scheme: 'file', language: 'php' }, { scheme: 'untitled', language: 'php' }],
+        revealOutputChannelOn: RevealOutputChannelOn.Never,
         uriConverters: {
             // VS Code by default %-encodes even the colon after the drive letter
             // NodeJS handles it much better