From c0ceebbb40b293ff4ce0c7efc7bbc12bd9ced4aa Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Mon, 12 Mar 2018 16:12:48 +0000 Subject: [PATCH 1/6] feat: Update felixfbecker/language-server from v5.3.7 to v5.4.0 --- composer.json | 2 +- composer.lock | 59 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 0e0660b..55ee04e 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "felixfbecker/language-server": "v5.3.7" + "felixfbecker/language-server": "v5.4.0" }, "scripts": { "parse-stubs": "LanguageServer\\ComposerScripts::parseStubs", diff --git a/composer.lock b/composer.lock index 9cad1ce..e4ebeb8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "80898332fb242b9c923adfeb741b3c0c", + "content-hash": "384d25adb13c4fee0e9cbbd7196b7c75", "packages": [ { "name": "composer/ca-bundle", @@ -265,6 +265,50 @@ ], "time": "2017-04-03T19:08:52+00:00" }, + { + "name": "composer/xdebug-handler", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "1852e549ad0d6f2910f89c27fec833dda1b25b4a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1852e549ad0d6f2910f89c27fec833dda1b25b4a", + "reference": "1852e549ad0d6f2910f89c27fec833dda1b25b4a", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0", + "psr/log": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "time": "2018-03-08T13:09:50+00:00" + }, { "name": "felixfbecker/advanced-json-rpc", "version": "v3.0.1", @@ -308,26 +352,27 @@ }, { "name": "felixfbecker/language-server", - "version": "v5.3.7", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server.git", - "reference": "e10896f90554c2f95b052c09fbc3685e84fb9a60" + "reference": "02b7d2fdb6ec81badef53668d3693412bd00b748" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/e10896f90554c2f95b052c09fbc3685e84fb9a60", - "reference": "e10896f90554c2f95b052c09fbc3685e84fb9a60", + "url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/02b7d2fdb6ec81badef53668d3693412bd00b748", + "reference": "02b7d2fdb6ec81badef53668d3693412bd00b748", "shasum": "" }, "require": { - "composer/composer": "^1.3", + "composer/xdebug-handler": "^1.0", "felixfbecker/advanced-json-rpc": "^3.0.0", "jetbrains/phpstorm-stubs": "dev-master", "microsoft/tolerant-php-parser": "0.0.*", "netresearch/jsonmapper": "^1.0", "php": "^7.0", "phpdocumentor/reflection-docblock": "^4.0.0", + "psr/log": "^1.0", "sabre/event": "^5.0", "sabre/uri": "^2.0", "webmozart/glob": "^4.1", @@ -374,7 +419,7 @@ "studio", "visual" ], - "time": "2018-02-28T19:21:04+00:00" + "time": "2018-03-11T20:50:12+00:00" }, { "name": "jetbrains/phpstorm-stubs", From 2765625a9fe0da9752169698a8ac9931a06f4800 Mon Sep 17 00:00:00 2001 From: "Dependencies.io Bot" Date: Sun, 18 Mar 2018 16:10:17 +0000 Subject: [PATCH 2/6] fix: Update microsoft/tolerant-php-parser from v0.0.9 to v0.0.10 --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index e4ebeb8..bc73edc 100644 --- a/composer.lock +++ b/composer.lock @@ -522,16 +522,16 @@ }, { "name": "microsoft/tolerant-php-parser", - "version": "v0.0.9", + "version": "v0.0.10", "source": { "type": "git", "url": "https://github.com/Microsoft/tolerant-php-parser.git", - "reference": "59351ce2a6b32c6cafc667dc20a48da36f38a482" + "reference": "694b1538bb73fdcf1b8ea8e20f5acd03aae594e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Microsoft/tolerant-php-parser/zipball/59351ce2a6b32c6cafc667dc20a48da36f38a482", - "reference": "59351ce2a6b32c6cafc667dc20a48da36f38a482", + "url": "https://api.github.com/repos/Microsoft/tolerant-php-parser/zipball/694b1538bb73fdcf1b8ea8e20f5acd03aae594e9", + "reference": "694b1538bb73fdcf1b8ea8e20f5acd03aae594e9", "shasum": "" }, "require": { @@ -559,7 +559,7 @@ } ], "description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios", - "time": "2018-02-14T18:39:41+00:00" + "time": "2018-03-18T03:12:58+00:00" }, { "name": "netresearch/jsonmapper", From 42eca3f8d7619b538a8199fced174f1a20014cac Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Wed, 4 Apr 2018 16:01:54 -0700 Subject: [PATCH 3/6] fix: restricting language services to file schemes --- src/extension.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index 0e1e01e..fc9b83f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -93,7 +93,10 @@ export async function activate(context: vscode.ExtensionContext): Promise // Options to control the language client const clientOptions: LanguageClientOptions = { // Register the server for php documents - documentSelector: ['php'], + documentSelector: [ + { scheme: 'file', language: 'php' }, + { scheme: 'untitled', language: 'php' } + ], uriConverters: { // VS Code by default %-encodes even the colon after the drive letter // NodeJS handles it much better From e039550c9295a4409bf01a3568ebed78d155c3eb Mon Sep 17 00:00:00 2001 From: "dependencies[bot]" Date: Wed, 11 Apr 2018 09:58:54 -0700 Subject: [PATCH 4/6] chore: Update composer/xdebug-handler in / from 1.0.0 to 1.1.0 (#291) --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index bc73edc..899efef 100644 --- a/composer.lock +++ b/composer.lock @@ -267,16 +267,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "1852e549ad0d6f2910f89c27fec833dda1b25b4a" + "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1852e549ad0d6f2910f89c27fec833dda1b25b4a", - "reference": "1852e549ad0d6f2910f89c27fec833dda1b25b4a", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/c919dc6c62e221fc6406f861ea13433c0aa24f08", + "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08", "shasum": "" }, "require": { @@ -307,7 +307,7 @@ "Xdebug", "performance" ], - "time": "2018-03-08T13:09:50+00:00" + "time": "2018-04-11T15:42:36+00:00" }, { "name": "felixfbecker/advanced-json-rpc", From ff761ef61687897150f10e0c0f7ca5b47abb0fdd Mon Sep 17 00:00:00 2001 From: Zachary Hamm Date: Thu, 26 Apr 2018 19:00:37 -0500 Subject: [PATCH 5/6] docs(readme): npm command in README.md should be 'run build' (#290) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99a7f53..7a56160 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Clone whole repository and in root directory execute: ```bash composer install npm install -npm run compile +npm run build code . ``` The last command will open the folder in VS Code. Hit `F5` to launch an Extension Development Host with the extension. From 21d79b5fd64fb7dcc09d97febf48ade309256e65 Mon Sep 17 00:00:00 2001 From: Matt Welke Date: Thu, 26 Apr 2018 20:02:30 -0400 Subject: [PATCH 6/6] docs(features): change readme for 'format code' (new extension PHP CS Fixer) (#252) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a56160..393618a 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,11 @@ I recommend to disable VS Code's built-in PHP IntelliSense by setting `php.sugge ### Column-accurate error reporting ![Error reporting demo](images/publishDiagnostics.png) -### Format code +### Code style linting Please use a dedicated extension like [PHP CodeSniffer](https://marketplace.visualstudio.com/items?itemName=ikappas.phpcs). +### Format code +Please use a dedicated extension like [PHP CS Fixer](https://marketplace.visualstudio.com/items?itemName=junstyle.php-cs-fixer). ## Todo - Rename