Compare commits

..

No commits in common. "master" and "v2.3.11" have entirely different histories.

9 changed files with 37 additions and 10841 deletions

1
.gitignore vendored
View File

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

1
.npmrc Normal file
View File

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

View File

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

View File

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

View File

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

46
composer.lock generated
View File

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

10803
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -59,7 +59,7 @@
"@types/mocha": "5.2.7",
"@types/mz": "0.0.32",
"@types/node": "8.10.29",
"@types/semver": "6.2.0",
"@types/semver": "5.5.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": "6.3.0",
"semver": "5.6.0",
"vscode-languageclient": "5.1.1"
},
"commitlint": {

View File

@ -5,8 +5,7 @@ import * as path from 'path'
import * as semver from 'semver'
import * as url from 'url'
import * as vscode from 'vscode'
import { LanguageClient, LanguageClientOptions, RevealOutputChannelOn, StreamInfo } from 'vscode-languageclient'
const composerJson = require('../composer.json')
import { LanguageClient, LanguageClientOptions, StreamInfo } from 'vscode-languageclient'
export async function activate(context: vscode.ExtensionContext): Promise<void> {
const conf = vscode.workspace.getConfiguration('php')
@ -59,8 +58,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, composerJson.config.platform.php)) {
vscode.window.showErrorMessage('The language server needs at least PHP 7.1 installed. Version found: ' + version)
if (semver.lt(version, '7.0.0')) {
vscode.window.showErrorMessage('The language server needs at least PHP 7 installed. Version found: ' + version)
return
}
@ -112,7 +111,6 @@ 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