From a04e556e6b8f6539f0eefb2558b1b9c88bc0dff5 Mon Sep 17 00:00:00 2001 From: Allan Simon Date: Sun, 3 Sep 2017 00:18:33 +0200 Subject: [PATCH 1/2] update composer.json php codesniffer it has been released in 3.0.X as stable --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 50f314bc..6b7accfb 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "phpdocumentor/reflection-docblock": "~3.1.1", "sabre/event": "^5.0", "felixfbecker/advanced-json-rpc": "^2.0", - "squizlabs/php_codesniffer" : "3.0.0RC3", + "squizlabs/php_codesniffer" : "^3.0", "netresearch/jsonmapper": "^1.0", "webmozart/path-util": "^2.3", "webmozart/glob": "^4.1", From ebe4a663d03b5167623cf76c589f16e0d848f8a0 Mon Sep 17 00:00:00 2001 From: Allan Simon Date: Sun, 3 Sep 2017 14:59:14 +0200 Subject: [PATCH 2/2] Update php-language-server.php to include manually the autoload from php_codesniffer see https://github.com/squizlabs/PHP_CodeSniffer/commit/566a0cdf6cdb8fbc5a5a248cdf23f7d77a968de7#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780L27 --- bin/php-language-server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/php-language-server.php b/bin/php-language-server.php index 2a2ab695..bae734a5 100644 --- a/bin/php-language-server.php +++ b/bin/php-language-server.php @@ -8,7 +8,7 @@ ini_set('memory_limit', $options['memory-limit'] ?? '4G'); -foreach ([__DIR__ . '/../../../autoload.php', __DIR__ . '/../autoload.php', __DIR__ . '/../vendor/autoload.php'] as $file) { +foreach ([__DIR__ . '/../../../autoload.php', __DIR__ . '/../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/../vendor/squizlabs/php_codesniffer/autoload.php'] as $file) { if (file_exists($file)) { require $file; break;