From 23b127a986ae7901303ea7f49fd768156f11d2e9 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Tue, 11 Oct 2016 14:50:10 +0200
Subject: [PATCH] Add Symfony ErrorHandler (#58)

---
 bin/php-language-server.php | 6 +++++-
 composer.json               | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/php-language-server.php b/bin/php-language-server.php
index 8036e78..a36714a 100644
--- a/bin/php-language-server.php
+++ b/bin/php-language-server.php
@@ -2,9 +2,9 @@
 
 use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
 use Sabre\Event\Loop;
+use Symfony\Component\Debug\ErrorHandler;
 
 ini_set('memory_limit', '-1');
-cli_set_process_title('PHP Language Server');
 
 foreach ([__DIR__ . '/../../../autoload.php', __DIR__ . '/../autoload.php', __DIR__ . '/../vendor/autoload.php'] as $file) {
     if (file_exists($file)) {
@@ -13,6 +13,10 @@ foreach ([__DIR__ . '/../../../autoload.php', __DIR__ . '/../autoload.php', __DI
     }
 }
 
+ErrorHandler::register();
+
+cli_set_process_title('PHP Language Server');
+
 if (count($argv) >= 3 && $argv[1] === '--tcp') {
     $address = $argv[2];
     $socket = stream_socket_client('tcp://' . $address, $errno, $errstr);
diff --git a/composer.json b/composer.json
index 2eef524..24a9d32 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,8 @@
         "phpdocumentor/reflection-docblock": "^3.0",
         "sabre/event": "^4.0",
         "felixfbecker/advanced-json-rpc": "^1.2",
-        "squizlabs/php_codesniffer" : "^2.7"
+        "squizlabs/php_codesniffer" : "^2.7",
+        "symfony/debug": "^3.1"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,