WebSocketHandeShakeException is deprecated, please use `WebSocketHa…

…ndShakeException` instead. (#6621)

src/ConfigProvider.php

@@ -12,6 +12,11 @@
 
 namespace Hyperf\WebSocketServer;
 
+use Hyperf\WebSocketServer\Exception\WebSocketHandShakeException;
+
+// Will remove at v3.2
+class_alias(WebSocketHandShakeException::class, 'Hyperf\WebSocketServer\Exception\WebSocketHandeShakeException');
+
 class ConfigProvider
 {
     public function __invoke(): array

src/CoreMiddleware.php

@@ -16,7 +16,7 @@
 use Hyperf\HttpMessage\Base\Response;
 use Hyperf\HttpServer\CoreMiddleware as HttpCoreMiddleware;
 use Hyperf\HttpServer\Router\Dispatched;
-use Hyperf\WebSocketServer\Exception\WebSocketHandeShakeException;
+use Hyperf\WebSocketServer\Exception\WebSocketHandShakeException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -31,7 +31,7 @@ protected function handleFound(Dispatched $dispatched, ServerRequestInterface $r
     {
         [$controller] = $this->prepareHandler($dispatched->handler->callback);
         if (! $this->container->has($controller)) {
-            throw new WebSocketHandeShakeException('Router not exist.');
+            throw new WebSocketHandShakeException('Router not exist.');
         }
 
         /** @var Response $response */

src/Exception/WebSocketHandShakeException.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\WebSocketServer\Exception;
+
+use Hyperf\HttpMessage\Exception\BadRequestHttpException;
+
+class WebSocketHandShakeException extends BadRequestHttpException
+{
+}

src/Exception/WebSocketHandeShakeException.php

@@ -12,8 +12,11 @@
 
 namespace Hyperf\WebSocketServer\Exception;
 
-use Hyperf\HttpMessage\Exception\BadRequestHttpException;
-
-class WebSocketHandeShakeException extends BadRequestHttpException
-{
+if (! class_exists('Hyperf\WebSocketServer\Exception\WebSocketHandeShakeException', false)) {
+    /**
+     * @deprecated since v3.1, will remove at v3.2. Please use Hyperf\WebSocketServer\Exception\WebSocketHandShakeException instead.
+     */
+    class WebSocketHandeShakeException extends WebSocketHandShakeException
+    {
+    }
 }

src/Server.php

@@ -42,7 +42,7 @@
 use Hyperf\WebSocketServer\Collector\FdCollector;
 use Hyperf\WebSocketServer\Context as WsContext;
 use Hyperf\WebSocketServer\Exception\Handler\WebSocketExceptionHandler;
-use Hyperf\WebSocketServer\Exception\WebSocketHandeShakeException;
+use Hyperf\WebSocketServer\Exception\WebSocketHandShakeException;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -130,7 +130,7 @@ public function onHandShake($request, $response): void
 
             $key = $psr7Request->getHeaderLine(Security::SEC_WEBSOCKET_KEY);
             if ($security->isInvalidSecurityKey($key)) {
-                throw new WebSocketHandeShakeException('sec-websocket-key is invalid!');
+                throw new WebSocketHandShakeException('sec-websocket-key is invalid!');
             }
 
             $psr7Request = $this->coreMiddleware->dispatch($psr7Request);