Merge branch 'master' into autocomplete-add-pseudo-keywords

.travis.yml

@@ -1,9 +1,8 @@
-
 language: php
 
 php:
   - '7.0'
-  - '7.2.0RC5'
+  - '7.2'
 
 git:
   depth: 10

Performance.php

@@ -51,11 +51,7 @@ foreach($frameworks as $framework) {
         $definitionResolver = new DefinitionResolver($index);
         $parser = new PhpParser\Parser();
 
-        try {
+        $document = new PhpDocument($testCaseFile, $fileContents, $index, $parser, $docBlockFactory, $definitionResolver);
-            $document = new PhpDocument($testCaseFile, $fileContents, $index, $parser, $docBlockFactory, $definitionResolver);
-        } catch (\Throwable $e) {
-            continue;
-        }
     }
 
     echo "------------------------------\n";

README.md

@@ -211,6 +211,6 @@ The project parses PHPStorm's PHP stubs to get support for PHP builtins. It re-p
     
 To debug with xDebug ensure that you have this set as an environment variable
 
-    COMPOSER_ALLOW_XDEBUG=1
+    PHPLS_ALLOW_XDEBUG=1
 
 This tells the Language Server to not restart without XDebug if it detects that XDebug is enabled (XDebug has a high performance impact).

bin/php-language-server.php

@@ -1,8 +1,8 @@
 <?php
 
-use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
+use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter, StderrLogger};
 use Sabre\Event\Loop;
-use Composer\{Factory, XdebugHandler};
+use Composer\XdebugHandler\XdebugHandler;
 
 $options = getopt('', ['tcp::', 'tcp-server::', 'memory-limit::']);
 
@@ -24,22 +24,27 @@ set_error_handler(function (int $severity, string $message, string $file, int $l
     throw new \ErrorException($message, 0, $severity, $file, $line);
 });
 
+$logger = new StderrLogger();
+
 // Only write uncaught exceptions to STDERR, not STDOUT
-set_exception_handler(function (\Throwable $e) {
+set_exception_handler(function (\Throwable $e) use ($logger) {
-    fwrite(STDERR, (string)$e);
+    $logger->critical((string)$e);
 });
 
 @cli_set_process_title('PHP Language Server');
 
 // If XDebug is enabled, restart without it
-(new XdebugHandler(Factory::createOutput()))->check();
+$xdebugHandler = new XdebugHandler('PHPLS');
+$xdebugHandler->setLogger($logger);
+$xdebugHandler->check();
+unset($xdebugHandler);
 
 if (!empty($options['tcp'])) {
     // Connect to a TCP server
     $address = $options['tcp'];
     $socket = stream_socket_client('tcp://' . $address, $errno, $errstr);
     if ($socket === false) {
-        fwrite(STDERR, "Could not connect to language client. Error $errno\n$errstr");
+        $logger->critical("Could not connect to language client. Error $errno\n$errstr");
         exit(1);
     }
     stream_set_blocking($socket, false);
@@ -53,29 +58,30 @@ if (!empty($options['tcp'])) {
     $address = $options['tcp-server'];
     $tcpServer = stream_socket_server('tcp://' . $address, $errno, $errstr);
     if ($tcpServer === false) {
-        fwrite(STDERR, "Could not listen on $address. Error $errno\n$errstr");
+        $logger->critical("Could not listen on $address. Error $errno\n$errstr");
         exit(1);
     }
-    fwrite(STDOUT, "Server listening on $address\n");
+    $logger->debug("Server listening on $address");
-    if (!extension_loaded('pcntl')) {
+    $pcntlAvailable = extension_loaded('pcntl');
-        fwrite(STDERR, "PCNTL is not available. Only a single connection will be accepted\n");
+    if (!$pcntlAvailable) {
+        $logger->notice('PCNTL is not available. Only a single connection will be accepted');
     }
     while ($socket = stream_socket_accept($tcpServer, -1)) {
-        fwrite(STDOUT, "Connection accepted\n");
+        $logger->debug('Connection accepted');
         stream_set_blocking($socket, false);
-        if (extension_loaded('pcntl')) {
+        if ($pcntlAvailable) {
             // If PCNTL is available, fork a child process for the connection
             // An exit notification will only terminate the child process
             $pid = pcntl_fork();
             if ($pid === -1) {
-                fwrite(STDERR, "Could not fork\n");
+                $logger->critical('Could not fork');
                 exit(1);
             } else if ($pid === 0) {
                 // Child process
                 $reader = new ProtocolStreamReader($socket);
                 $writer = new ProtocolStreamWriter($socket);
-                $reader->on('close', function () {
+                $reader->on('close', function () use ($logger) {
-                    fwrite(STDOUT, "Connection closed\n");
+                    $logger->debug('Connection closed');
                 });
                 $ls = new LanguageServer($reader, $writer);
                 Loop\run();
@@ -94,6 +100,7 @@ if (!empty($options['tcp'])) {
     }
 } else {
     // Use STDIO
+    $logger->debug('Listening on STDIN');
     stream_set_blocking(STDIN, false);
     $ls = new LanguageServer(
         new ProtocolStreamReader(STDIN),

composer.json

@@ -22,12 +22,13 @@
     ],
     "require": {
         "php": "^7.0",
-        "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",
         "phpdocumentor/reflection-docblock": "^4.0.0",
+        "psr/log": "^1.0",
         "sabre/event": "^5.0",
         "sabre/uri": "^2.0",
         "webmozart/glob": "^4.1",

dependencies.yml

@@ -10,9 +10,6 @@ collectors:
       commit_message_prefix: "chore: "
 - type: js-npm
   path: /
-  settings:
-    dist_tags:
-      semantic-release: next
   actors:
   - type: js-npm
     versions: "Y.0.0"

src/Cache/FileSystemCache.php

@@ -3,7 +3,6 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Cache;
 
-use LanguageServer\LanguageClient;
 use Sabre\Event\Promise;
 
 /**

src/Client/TextDocument.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\{Message, TextDocumentItem, TextDocumentIdentifier};
+use LanguageServer\Protocol\{TextDocumentItem, TextDocumentIdentifier};
 use Sabre\Event\Promise;
 use JsonMapper;
 

src/Client/Window.php

@@ -4,7 +4,6 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
 use Sabre\Event\Promise;
 
 /**

src/Client/XCache.php

@@ -4,7 +4,6 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
 use Sabre\Event\Promise;
 
 /**

src/Definition.php

@@ -6,7 +6,6 @@ namespace LanguageServer;
 use LanguageServer\Index\ReadableIndex;
 use phpDocumentor\Reflection\{Types, Type, Fqsen, TypeResolver};
 use LanguageServer\Protocol\SymbolInformation;
-use Exception;
 use Generator;
 
 /**
@@ -69,7 +68,7 @@ class Definition
     public $canBeInstantiated;
 
     /**
-     * @var Protocol\SymbolInformation
+     * @var SymbolInformation
      */
     public $symbolInformation;
 

src/FqnUtilities.php

@@ -3,7 +3,6 @@
 namespace LanguageServer\FqnUtilities;
 
 use phpDocumentor\Reflection\{Type, Types};
-use Microsoft\PhpParser;
 
 /**
  * Returns all possible FQNs in a type

src/Indexer.php

@@ -6,10 +6,8 @@ namespace LanguageServer;
 use LanguageServer\Cache\Cache;
 use LanguageServer\FilesFinder\FilesFinder;
 use LanguageServer\Index\{DependenciesIndex, Index};
-use LanguageServer\Protocol\Message;
 use LanguageServer\Protocol\MessageType;
 use Webmozart\PathUtil\Path;
-use Composer\Semver\VersionParser;
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;
 

src/PhpDocument.php

@@ -160,7 +160,9 @@ class PhpDocument
 
         // Register this document on the project for references
         foreach ($this->referenceNodes as $fqn => $nodes) {
-            $this->index->addReferenceUri($fqn, $this->uri);
+            // Cast the key to string. If (string)'2' is set as an array index, it will read out as (int)2. We must
+            // deal with incorrect code, so this is a valid scenario.
+            $this->index->addReferenceUri((string)$fqn, $this->uri);
         }
 
         $this->sourceFileNode = $treeAnalyzer->getSourceFileNode();

src/Protocol/SymbolInformation.php

@@ -4,7 +4,6 @@ namespace LanguageServer\Protocol;
 
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
-use Exception;
 
 /**
  * Represents information about programming constructs like variables, classes,

src/ProtocolStreamWriter.php

@@ -8,7 +8,6 @@ use Sabre\Event\{
     Loop,
     Promise
 };
-use RuntimeException;
 
 class ProtocolStreamWriter implements ProtocolWriter
 {

src/Server/TextDocument.php

@@ -23,7 +23,6 @@ use LanguageServer\Protocol\{
     VersionedTextDocumentIdentifier,
     CompletionContext
 };
-use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Sabre\Event\Promise;
 use Sabre\Uri;

src/Server/Workspace.php

@@ -3,18 +3,16 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Server;
 
-use LanguageServer\{LanguageClient, Project, PhpDocumentLoader};
+use LanguageServer\{LanguageClient, PhpDocumentLoader};
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\Protocol\{
     FileChangeType,
     FileEvent,
     SymbolInformation,
     SymbolDescriptor,
-    PackageDescriptor,
     ReferenceInformation,
     DependencyReference,
-    Location,
+    Location
-    MessageType
 };
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;

src/SignatureHelpProvider.php

@@ -7,10 +7,8 @@ use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Protocol\{
     Position,
     SignatureHelp,
-    SignatureInformation,
     ParameterInformation
 };
-use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;

src/StderrLogger.php

@@ -0,0 +1,25 @@
+<?php
+declare(strict_types = 1);
+
+namespace LanguageServer;
+
+/**
+ * Simple Logger that logs to STDERR
+ */
+class StderrLogger extends \Psr\Log\AbstractLogger implements \Psr\Log\LoggerInterface
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function log($level, $message, array $context = array())
+    {
+        $contextStr = empty($context) ? '' : ' ' . \json_encode($context, \JSON_UNESCAPED_SLASHES);
+        \fwrite(\STDERR, \str_pad(\strtoupper((string)$level), 10) . $message . $contextStr . \PHP_EOL);
+    }
+}

src/TreeAnalyzer.php

@@ -3,10 +3,8 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position, TextEdit};
+use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position};
-use LanguageServer\Index\Index;
 use phpDocumentor\Reflection\DocBlockFactory;
-use Sabre\Uri;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\Token;