Merge branch 'master' into master

pull/252/head
Matt Welke 2018-03-08 13:05:36 -05:00 committed by GitHub
commit 14831f7e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 15 deletions

View File

@ -2,7 +2,7 @@
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"felixfbecker/language-server": "v5.3.4" "felixfbecker/language-server": "v5.3.7"
}, },
"scripts": { "scripts": {
"parse-stubs": "LanguageServer\\ComposerScripts::parseStubs", "parse-stubs": "LanguageServer\\ComposerScripts::parseStubs",

22
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "c923857f79f4cb58f8c71befd063489d", "content-hash": "80898332fb242b9c923adfeb741b3c0c",
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
@ -308,16 +308,16 @@
}, },
{ {
"name": "felixfbecker/language-server", "name": "felixfbecker/language-server",
"version": "v5.3.4", "version": "v5.3.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/felixfbecker/php-language-server.git", "url": "https://github.com/felixfbecker/php-language-server.git",
"reference": "6894d85aaf2907d72db443f1a8b0a8d52f640900" "reference": "e10896f90554c2f95b052c09fbc3685e84fb9a60"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/6894d85aaf2907d72db443f1a8b0a8d52f640900", "url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/e10896f90554c2f95b052c09fbc3685e84fb9a60",
"reference": "6894d85aaf2907d72db443f1a8b0a8d52f640900", "reference": "e10896f90554c2f95b052c09fbc3685e84fb9a60",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -374,7 +374,7 @@
"studio", "studio",
"visual" "visual"
], ],
"time": "2018-01-09T09:38:18+00:00" "time": "2018-02-28T19:21:04+00:00"
}, },
{ {
"name": "jetbrains/phpstorm-stubs", "name": "jetbrains/phpstorm-stubs",
@ -477,16 +477,16 @@
}, },
{ {
"name": "microsoft/tolerant-php-parser", "name": "microsoft/tolerant-php-parser",
"version": "v0.0.8", "version": "v0.0.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Microsoft/tolerant-php-parser.git", "url": "https://github.com/Microsoft/tolerant-php-parser.git",
"reference": "10e901a6086826376c6256954dc8903ef0ec6c9e" "reference": "59351ce2a6b32c6cafc667dc20a48da36f38a482"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Microsoft/tolerant-php-parser/zipball/10e901a6086826376c6256954dc8903ef0ec6c9e", "url": "https://api.github.com/repos/Microsoft/tolerant-php-parser/zipball/59351ce2a6b32c6cafc667dc20a48da36f38a482",
"reference": "10e901a6086826376c6256954dc8903ef0ec6c9e", "reference": "59351ce2a6b32c6cafc667dc20a48da36f38a482",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -514,7 +514,7 @@
} }
], ],
"description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios", "description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios",
"time": "2017-11-17T17:06:43+00:00" "time": "2018-02-14T18:39:41+00:00"
}, },
{ {
"name": "netresearch/jsonmapper", "name": "netresearch/jsonmapper",

View File

@ -47,14 +47,15 @@
"commitmsg": "validate-commit-msg" "commitmsg": "validate-commit-msg"
}, },
"devDependencies": { "devDependencies": {
"@semantic-release/git": "^2.0.0",
"@types/mocha": "^2.2.42", "@types/mocha": "^2.2.42",
"@types/mz": "^0.0.31", "@types/mz": "^0.0.31",
"@types/node": "^8.0.24", "@types/node": "^8.0.24",
"@types/semver": "^5.3.34", "@types/semver": "^5.3.34",
"cz-conventional-changelog": "^2.0.0", "cz-conventional-changelog": "^2.0.0",
"husky": "^0.14.3", "husky": "^0.14.3",
"semantic-release": "^11.0.0", "semantic-release": "^12.4.1",
"semantic-release-vsce": "^1.0.0", "semantic-release-vsce": "^2.0.0",
"tslint": "^5.0.0", "tslint": "^5.0.0",
"typescript": "^2.1.4", "typescript": "^2.1.4",
"validate-commit-msg": "^2.14.0", "validate-commit-msg": "^2.14.0",
@ -75,7 +76,7 @@
"semantic-release-vsce", "semantic-release-vsce",
"@semantic-release/github" "@semantic-release/github"
], ],
"getLastRelease": "semantic-release-vsce", "getLastRelease": "@semantic-release/git",
"publish": [ "publish": [
{ {
"path": "semantic-release-vsce", "path": "semantic-release-vsce",