Merge branch 'master' into composer/composer-1.5.6-#84.1.0

pull/227/head
Felix Becker 2017-12-23 14:34:39 -08:00 committed by GitHub
commit 9eef70e087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions

View File

@ -37,5 +37,5 @@ stages:
if: branch = master AND type = push AND fork = false if: branch = master AND type = push AND fork = false
branches: branches:
except: only:
- /^v\d+\.\d+\.\d+$/ - master

View File

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

12
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": "f3b7292c8269e459ec9b9118339eba0d", "content-hash": "7d376764a8b35f1946939f7493252577",
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
@ -308,16 +308,16 @@
}, },
{ {
"name": "felixfbecker/language-server", "name": "felixfbecker/language-server",
"version": "v5.2.0", "version": "v5.3.0",
"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": "a40cf731f791788c9179d6771cb59f47122994ad" "reference": "a0caf8d18f85cffba816ced7ae1318d22ff63515"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/a40cf731f791788c9179d6771cb59f47122994ad", "url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/a0caf8d18f85cffba816ced7ae1318d22ff63515",
"reference": "a40cf731f791788c9179d6771cb59f47122994ad", "reference": "a0caf8d18f85cffba816ced7ae1318d22ff63515",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -374,7 +374,7 @@
"studio", "studio",
"visual" "visual"
], ],
"time": "2017-12-10T05:10:43+00:00" "time": "2017-12-23T02:03:24+00:00"
}, },
{ {
"name": "jetbrains/phpstorm-stubs", "name": "jetbrains/phpstorm-stubs",

View File

@ -47,7 +47,6 @@
"commitmsg": "validate-commit-msg" "commitmsg": "validate-commit-msg"
}, },
"devDependencies": { "devDependencies": {
"@semantic-release/github": "^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",