Merge 96c7db6855 into 9e65cd4cf0

bin/php-language-server.php

@@ -3,6 +3,8 @@
 use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
 use Sabre\Event\Loop;
 use Symfony\Component\Debug\ErrorHandler;
+use Monolog\Logger;
+use Monolog\Handler\StreamHandler;
 
 $options = getopt('', ['tcp::', 'memory-limit::']);
 
@@ -15,7 +17,11 @@ foreach ([__DIR__ . '/../../../autoload.php', __DIR__ . '/../autoload.php', __DI
     }
 }
 
-ErrorHandler::register();
+$logger = new Logger('Errors');
+$logger->pushHandler(new StreamHandler(STDERR));
+$errorHandler = new ErrorHandler;
+$errorHandler->setDefaultLogger($logger);
+ErrorHandler::register($errorHandler);
 
 @cli_set_process_title('PHP Language Server');
 

composer.json

@@ -29,7 +29,8 @@
         "sabre/event": "^5.0",
         "felixfbecker/advanced-json-rpc": "^2.0",
         "squizlabs/php_codesniffer" : "^2.7",
-        "symfony/debug": "^3.1"
+        "symfony/debug": "^3.1",
+        "monolog/monolog": "^1.21"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

tests/LanguageServerTest.php

@@ -46,4 +46,19 @@ class LanguageServerTest extends TestCase
             ]
         ], $msg->body->result);
     }
+
+    public function testIndexing()
+    {
+        $input = new MockProtocolStream;
+        $output = new MockProtocolStream;
+        $output->on('message', function (Message $msg) {
+            var_dump($msg);
+        });
+        $server = new LanguageServer($input, $output);
+        $capabilities = new ClientCapabilities;
+        $capabilities->xcontent = true;
+        $capabilities->xglob = true;
+        $server->initialize(getmypid(), $capabilities, __DIR__);
+        \Sabre\Event\Loop\run();
+    }
 }