Made 'Message' part of this package

src/ClientHandler.php

@@ -5,6 +5,7 @@ namespace LanguageServer;
 
 use AdvancedJsonRpc;
 use Sabre\Event\Promise;
+use LanguageServer\ProtocolBridge\Message;
 
 class ClientHandler
 {
@@ -41,12 +42,12 @@ class ClientHandler
     {
         $id = $this->idGenerator->generate();
         return $this->protocolWriter->write(
-            new Protocol\Message(
+            new ProtocolBridge\Message(
-                (new AdvancedJsonRpc\Request($id, $method, (object)$params))->__toString()
+                new AdvancedJsonRpc\Request($id, $method, (object)$params)
             )
         )->then(function () use ($id) {
             $promise = new Promise;
-            $listener = function (Protocol\Message $msg) use ($id, $promise, &$listener) {
+            $listener = function (ProtocolBridge\Message $msg) use ($id, $promise, &$listener) {
                 if (AdvancedJsonRpc\Response::isResponse($msg->body) && $msg->body->id === $id) {
                     // Received a response
                     $this->protocolReader->removeListener('message', $listener);
@@ -72,7 +73,7 @@ class ClientHandler
     public function notify(string $method, $params): Promise
     {
         return $this->protocolWriter->write(
-            new Protocol\Message(
+            new ProtocolBridge\Message(
                 new AdvancedJsonRpc\Notification($method, (object)$params)
             )
         );

src/ProtocolBridge/Message.php

@@ -1,9 +1,10 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\Protocol;
+namespace LanguageServer\ProtocolBridge;
 
 use AdvancedJsonRpc\Message as MessageBody;
+use LanguageServer\ProtocolBridge\Message;
 
 class Message
 {

src/ProtocolBridge/MessageFactory.php

@@ -3,7 +3,7 @@
 namespace LanguageServer\ProtocolBridge;
 
 use AdvancedJsonRpc\Message as AdvancedJsonRpcMessage;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 
 class MessageFactory
 {

src/ProtocolStreamReader.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc\Message as MessageBody;
 use Sabre\Event\{Loop, Emitter};
 

src/ProtocolStreamWriter.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use Sabre\Event\{
     Loop,
     Promise

src/ProtocolWriter.php

@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use Sabre\Event\Promise;
 
 interface ProtocolWriter

tests/ClientHandlerTest.php

@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc;
 use Sabre\Event\Loop;
 

tests/MockProtocolStream.php

@@ -4,8 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests;
 
 use LanguageServer\{ProtocolReader, ProtocolWriter};
-use LanguageServer\ProtocolBridge\MessageFactory;
+use LanguageServer\ProtocolBridge\Message;
-use LanguageServer\Protocol\Message;
 use Sabre\Event\{Loop, Emitter, Promise};
 
 /**
@@ -22,7 +21,7 @@ class MockProtocolStream extends Emitter implements ProtocolReader, ProtocolWrit
     public function write(Message $msg): Promise
     {
         Loop\nextTick(function () use ($msg) {
-            $this->emit('message', [MessageFactory::fromRawMessage((string)$msg)]);
+            $this->emit('message', [Message::parse((string)$msg)]);
         });
         return Promise\resolve(null);
     }

tests/ProtocolStreamReaderTest.php

@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc\{Request as RequestBody, Response as ResponseBody};
 use Sabre\Event\Loop;
 

tests/ProtocolStreamWriterTest.php

@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ProtocolStreamWriter;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc\{Request as RequestBody};
 use Sabre\Event\Loop;
 

tests/Validation/ValidationTest.php

@@ -13,7 +13,7 @@ use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlockFactory;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
+use LanguageServer\ProtocolBridge\Message;
 use AdvancedJsonRpc;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;