changes language server protocol namespace

src/Client/TextDocument.php

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

src/Client/Workspace.php

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

src/CompletionProvider.php

@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Factory\CompletionItemFactory;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextEdit,
     Range,
     Position,

src/ContentRetriever/ClientContentRetriever.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\ContentRetriever;
 
 use LanguageServer\LanguageClient;
-use LanguageServer\Protocol\{TextDocumentIdentifier, TextDocumentItem};
+use LanguageServerProtocol\{TextDocumentIdentifier, TextDocumentItem};
 use Sabre\Event\Promise;
 
 /**

src/Definition.php

@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
 use phpDocumentor\Reflection\{Types, Type, Fqsen, TypeResolver};
-use LanguageServer\Protocol\SymbolInformation;
+use LanguageServerProtocol\SymbolInformation;
 use Generator;
 
 /**

src/DefinitionResolver.php

@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Factory\SymbolInformationFactory;
-use LanguageServer\Protocol\SymbolInformation;
+use LanguageServerProtocol\SymbolInformation;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\FunctionLike;

src/Factory/CompletionItemFactory.php

@@ -3,9 +3,9 @@
 namespace LanguageServer\Factory;
 
 use LanguageServer\Definition;
-use LanguageServer\Protocol\CompletionItem;
-use LanguageServer\Protocol\CompletionItemKind;
-use LanguageServer\Protocol\SymbolKind;
+use LanguageServerProtocol\CompletionItem;
+use LanguageServerProtocol\CompletionItemKind;
+use LanguageServerProtocol\SymbolKind;
 
 class CompletionItemFactory
 {

src/Factory/LocationFactory.php

@@ -2,9 +2,9 @@
 
 namespace LanguageServer\Factory;
 
-use LanguageServer\Protocol\Location;
-use LanguageServer\Protocol\Position;
-use LanguageServer\Protocol\Range;
+use LanguageServerProtocol\Location;
+use LanguageServerProtocol\Position;
+use LanguageServerProtocol\Range;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\PositionUtilities;
 

src/Factory/RangeFactory.php

@@ -2,8 +2,8 @@
 
 namespace LanguageServer\Factory;
 
-use LanguageServer\Protocol\Position;
-use LanguageServer\Protocol\Range;
+use LanguageServerProtocol\Position;
+use LanguageServerProtocol\Range;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\PositionUtilities;
 

src/Factory/SymbolInformationFactory.php

@@ -2,9 +2,9 @@
 
 namespace LanguageServer\Factory;
 
-use LanguageServer\Protocol\Location;
-use LanguageServer\Protocol\SymbolInformation;
-use LanguageServer\Protocol\SymbolKind;
+use LanguageServerProtocol\Location;
+use LanguageServerProtocol\SymbolInformation;
+use LanguageServerProtocol\SymbolKind;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\ResolvedName;
 use LanguageServer\Factory\LocationFactory;

src/Indexer.php

@@ -6,7 +6,7 @@ namespace LanguageServer;
 use LanguageServer\Cache\Cache;
 use LanguageServer\FilesFinder\FilesFinder;
 use LanguageServer\Index\{DependenciesIndex, Index};
-use LanguageServer\Protocol\MessageType;
+use LanguageServerProtocol\MessageType;
 use Webmozart\PathUtil\Path;
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;

src/LanguageServer.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     ServerCapabilities,
     ClientCapabilities,
     TextDocumentSyncKind,

src/PhpDocument.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Index\Index;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Diagnostic, Position, Range
 };
 use Microsoft\PhpParser;

src/Server/TextDocument.php

@@ -9,7 +9,7 @@ use LanguageServer\{
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Factory\LocationFactory;
 use LanguageServer\Factory\RangeFactory;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     FormattingOptions,
     Hover,
     Location,
@@ -110,7 +110,7 @@ class TextDocument
      * The document symbol request is sent from the client to the server to list all symbols found in a given text
      * document.
      *
-     * @param \LanguageServer\Protocol\TextDocumentIdentifier $textDocument
+     * @param \LanguageServerProtocol\TextDocumentIdentifier $textDocument
      * @return Promise <SymbolInformation[]>
      */
     public function documentSymbol(TextDocumentIdentifier $textDocument): Promise
@@ -129,7 +129,7 @@ class TextDocument
      * document's truth is now managed by the client and the server must not try to read the document's truth using the
      * document's uri.
      *
-     * @param \LanguageServer\Protocol\TextDocumentItem $textDocument The document that was opened.
+     * @param \LanguageServerProtocol\TextDocumentItem $textDocument The document that was opened.
      * @return void
      */
     public function didOpen(TextDocumentItem $textDocument)
@@ -143,8 +143,8 @@ class TextDocument
     /**
      * The document change notification is sent from the client to the server to signal changes to a text document.
      *
-     * @param \LanguageServer\Protocol\VersionedTextDocumentIdentifier $textDocument
-     * @param \LanguageServer\Protocol\TextDocumentContentChangeEvent[] $contentChanges
+     * @param \LanguageServerProtocol\VersionedTextDocumentIdentifier $textDocument
+     * @param \LanguageServerProtocol\TextDocumentContentChangeEvent[] $contentChanges
      * @return void
      */
     public function didChange(VersionedTextDocumentIdentifier $textDocument, array $contentChanges)
@@ -159,7 +159,7 @@ class TextDocument
      * The document's truth now exists where the document's uri points to (e.g. if the document's uri is a file uri the
      * truth now exists on disk).
      *
-     * @param \LanguageServer\Protocol\TextDocumentIdentifier $textDocument The document that was closed
+     * @param \LanguageServerProtocol\TextDocumentIdentifier $textDocument The document that was closed
      * @return void
      */
     public function didClose(TextDocumentIdentifier $textDocument)

src/Server/Workspace.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Server;
 use LanguageServer\{LanguageClient, PhpDocumentLoader};
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\Factory\LocationFactory;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     FileChangeType,
     FileEvent,
     SymbolInformation,

src/SignatureHelpProvider.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Position,
     SignatureHelp,
     ParameterInformation

src/SignatureInformationFactory.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\{SignatureInformation, ParameterInformation};
+use LanguageServerProtocol\{SignatureInformation, ParameterInformation};
 use Microsoft\PhpParser\FunctionLike;
 
 class SignatureInformationFactory

src/TreeAnalyzer.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Factory\RangeFactory;
-use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position};
+use LanguageServerProtocol\{Diagnostic, DiagnosticSeverity, Range, Position};
 use phpDocumentor\Reflection\DocBlockFactory;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;

tests/Diagnostics/InvalidThisUsageTest.php

@@ -9,7 +9,7 @@ use LanguageServer\{
     DefinitionResolver, TreeAnalyzer
 };
 use LanguageServer\Index\{Index};
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Diagnostic, DiagnosticSeverity, Position, Range
 };
 use function LanguageServer\pathToUri;

tests/LanguageServerTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\LanguageServer;
 use LanguageServer\Message;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     ClientCapabilities,
     TextDocumentSyncKind,
     MessageType,

tests/PhpDocumentTest.php

@@ -9,7 +9,7 @@ use LanguageServer\{
 use LanguageServer\Index\{
     Index
 };
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Position
 };
 use Microsoft\PhpParser;

tests/Server/ServerTestCase.php

@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{Position, Location, Range};
+use LanguageServerProtocol\{Position, Location, Range};
 use function LanguageServer\pathToUri;
 
 abstract class ServerTestCase extends TestCase

tests/Server/TextDocument/CompletionTest.php

@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextDocumentIdentifier,
     TextEdit,
     Range,

tests/Server/TextDocument/Definition/GlobalFallbackTest.php

@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, Range, Location};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, Range, Location};
 
 class GlobalFallbackTest extends ServerTestCase
 {

tests/Server/TextDocument/Definition/GlobalTest.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests\Server\TextDocument\Definition;
 
 use LanguageServer\Tests\Server\ServerTestCase;
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, Location, Range};
 use function LanguageServer\pathToUri;
 
 class GlobalTest extends ServerTestCase

tests/Server/TextDocument/Definition/NamespacedTest.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Tests\Server\TextDocument\Definition;
 
-use LanguageServer\Protocol\{TextDocumentIdentifier, Location};
+use LanguageServerProtocol\{TextDocumentIdentifier, Location};
 use function LanguageServer\pathToUri;
 
 class NamespacedTest extends GlobalTest

tests/Server/TextDocument/DidChangeTest.php

@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     VersionedTextDocumentIdentifier,
     TextDocumentContentChangeEvent,
     Range,

tests/Server/TextDocument/DidCloseTest.php

@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
-use LanguageServer\Protocol\{TextDocumentItem, TextDocumentIdentifier};
+use LanguageServerProtocol\{TextDocumentItem, TextDocumentIdentifier};
 
 class DidCloseTest extends TestCase
 {

tests/Server/TextDocument/DocumentSymbolTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{Server, LanguageClient, Project};
-use LanguageServer\Protocol\{TextDocumentIdentifier, SymbolInformation, SymbolKind, Position, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, SymbolInformation, SymbolKind, Position, Location, Range};
 use function LanguageServer\pathToUri;
 
 class DocumentSymbolTest extends ServerTestCase

tests/Server/TextDocument/HoverTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{Server, LanguageClient, Project};
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, Range, Hover, MarkedString};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, Range, Hover, MarkedString};
 use function LanguageServer\pathToUri;
 
 class HoverTest extends ServerTestCase

tests/Server/TextDocument/ParseErrorsTest.php

@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{TextDocumentItem, DiagnosticSeverity};
+use LanguageServerProtocol\{TextDocumentItem, DiagnosticSeverity};
 use Sabre\Event\Promise;
 use JsonMapper;
 

tests/Server/TextDocument/References/GlobalFallbackTest.php

@@ -10,7 +10,7 @@ use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{
     DependenciesIndex, Index, ProjectIndex
 };
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     Location, Position, Range, ReferenceContext, TextDocumentIdentifier
 };
 use LanguageServer\Tests\MockProtocolStream;

tests/Server/TextDocument/References/GlobalTest.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
 use LanguageServer\Tests\Server\ServerTestCase;
 use function LanguageServer\pathToUri;
 

tests/Server/TextDocument/References/NamespacedTest.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
 use function LanguageServer\pathToUri;
 
 class NamespacedTest extends GlobalTest

tests/Server/TextDocument/SignatureHelpTest.php

@@ -10,7 +10,7 @@ use LanguageServer\{
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextDocumentIdentifier,
     TextEdit,
     Range,

tests/Server/Workspace/DidChangeWatchedFilesTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\Workspace;
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\{DefinitionResolver, LanguageClient, PhpDocumentLoader, Server};
 use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex};
-use LanguageServer\Protocol\{FileChangeType, FileEvent};
+use LanguageServerProtocol\{FileChangeType, FileEvent};
 use LanguageServer\Message;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;

tests/Server/Workspace/SymbolTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\Workspace;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{Server, Client, LanguageClient, Project, PhpDocument};
-use LanguageServer\Protocol\{
+use LanguageServerProtocol\{
     TextDocumentItem,
     TextDocumentIdentifier,
     SymbolInformation,

tests/Validation/ValidationTest.php

@@ -64,7 +64,7 @@ class ValidationTest extends TestCase
 
         try {
             $this->assertEquals($expectedValues['definitions'], $actualValues['definitions']);
-            $this->assertEquals((array)$expectedValues['references'], (array)$actualValues['references'], 'references don\'t match.');
+            $this->assertEquals((array)$expectedValues['references'], (array)$actualValues['references'], sprintf('references match in "%s"', $outputFile));
         } catch (\Throwable $e) {
             $outputFile = getExpectedValuesFile($testCaseFile);
             file_put_contents($outputFile, json_encode($actualValues, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));

tests/Validation/cases/namespaces5.php

@@ -1,3 +1,3 @@
 <?php
 namespace B;
-use LanguageServer\Protocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
+use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};

tests/Validation/cases/namespaces5.php.expected.json

@@ -1,24 +1,21 @@
 {
     "references": {
-        "LanguageServer\\Protocol": [
+        "LanguageServerProtocol": [
             "./namespaces5.php"
         ],
-        "LanguageServer": [
+        "LanguageServerProtocol\\TextDocumentIdentifier": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\TextDocumentIdentifier": [
+        "LanguageServerProtocol\\Position": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\Position": [
+        "LanguageServerProtocol\\ReferenceContext": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\ReferenceContext": [
+        "LanguageServerProtocol\\Location": [
             "./namespaces5.php"
         ],
-        "LanguageServer\\Protocol\\Location": [
-            "./namespaces5.php"
-        ],
-        "LanguageServer\\Protocol\\Range": [
+        "LanguageServerProtocol\\Range": [
             "./namespaces5.php"
         ]
     },