update some for ws server

swoft-cloud · Jun 22, 2020 · 25de3bf · 25de3bf
1 parent b098586
commit 25de3bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/db/src/Connection/Connection.php b/src/db/src/Connection/Connection.php
@@ -151,7 +151,7 @@ public function getPostProcessor()
      *
      * @return void
      */
-    public function useDefaultPostProcessor()
+    public function useDefaultPostProcessor(): void
     {
         $this->postProcessor = $this->getDefaultPostProcessor();
     }

diff --git a/src/websocket-server/src/Annotation/Mapping/WsModule.php b/src/websocket-server/src/Annotation/Mapping/WsModule.php
@@ -28,6 +28,7 @@
  *     @Attribute("path", type="string"),
  *     @Attribute("controllers", type="array"),
  *     @Attribute("messageParser", type="string"),
+ *     @Attribute("defaultCommand", type="string"),
  * )
  */
 final class WsModule

diff --git a/src/websocket-server/src/Connection.php b/src/websocket-server/src/Connection.php
@@ -15,9 +15,7 @@
 use Swoft\Bean\Annotation\Mapping\Bean;
 use Swoft\Contract\SessionInterface;
 use Swoft\Http\Message\Request;
-use Swoft\Http\Message\Request as Psr7Request;
 use Swoft\Http\Message\Response;
-use Swoft\Http\Message\Response as Psr7Response;
 use Swoft\Stdlib\Concern\DataPropertyTrait;
 use Swoft\Stdlib\Helper\JsonHelper;
 use Swoft\WebSocket\Server\Contract\MessageParserInterface;
@@ -152,8 +150,8 @@ public static function newFromArray(array $data): SessionInterface
         $res->header = $data['resHeader'];
 
         // Initialize psr7 Request and Response
-        $psr7Req  = Psr7Request::new($req);
-        $psr7Res  = Psr7Response::new($res);
+        $psr7Req  = Request::new($req);
+        $psr7Res  = Response::new($res);
         $wsServer = Swoft::getBean(WsServerBean::SERVER);
 
         // Initialize connection