Upgrade the minimum php version to 8.0 for websocket. (#4525)

Author: limingxinleo

src/Collector/Fd.php

@@ -13,19 +13,7 @@
 
 class Fd
 {
-    /**
-     * @var int
-     */
-    public $fd;
-
-    /**
-     * @var string
-     */
-    public $class;
-
-    public function __construct(int $fd, string $class)
+    public function __construct(public int $fd, public string $class)
     {
-        $this->fd = $fd;
-        $this->class = $class;
     }
 }

src/Collector/FdCollector.php

@@ -13,10 +13,7 @@
 
 class FdCollector
 {
-    /**
-     * @var array
-     */
-    protected static $fds = [];
+    protected static array $fds = [];
 
     public static function set(int $id, string $class): void
     {

src/Context.php

@@ -18,10 +18,7 @@ class Context
 {
     public const FD = 'ws.fd';
 
-    /**
-     * @var array
-     */
-    protected static $container = [];
+    protected static array $container = [];
 
     public static function set(string $id, $value)
     {
@@ -33,14 +30,14 @@ public static function set(string $id, $value)
 
     public static function get(string $id, $default = null, $fd = null)
     {
-        $fd = $fd ?? CoContext::get(Context::FD, 0);
+        $fd ??= CoContext::get(Context::FD, 0);
         $key = sprintf('%d.%s', $fd, $id);
         return data_get(self::$container, $key, $default);
     }
 
     public static function has(string $id, $fd = null)
     {
-        $fd = $fd ?? CoContext::get(Context::FD, 0);
+        $fd ??= CoContext::get(Context::FD, 0);
         $key = sprintf('%d.%s', $fd, $id);
         return data_get(self::$container, $key) !== null;
     }
@@ -53,7 +50,7 @@ public static function destroy(string $id)
 
     public static function release(?int $fd = null)
     {
-        $fd = $fd ?? CoContext::get(Context::FD, 0);
+        $fd ??= CoContext::get(Context::FD, 0);
         unset(self::$container[strval($fd)]);
     }
 

src/Exception/Handler/WebSocketExceptionHandler.php

@@ -21,20 +21,8 @@
 
 class WebSocketExceptionHandler extends ExceptionHandler
 {
-    /**
-     * @var StdoutLoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @var FormatterInterface
-     */
-    protected $formatter;
-
-    public function __construct(StdoutLoggerInterface $logger, FormatterInterface $formatter)
+    public function __construct(protected StdoutLoggerInterface $logger, protected FormatterInterface $formatter)
     {
-        $this->logger = $logger;
-        $this->formatter = $formatter;
     }
 
     public function handle(Throwable $throwable, ResponseInterface $response)
@@ -43,7 +31,7 @@ public function handle(Throwable $throwable, ResponseInterface $response)
         if ($throwable instanceof HttpException) {
             $response = $response->withStatus($throwable->getStatusCode());
         }
-        $stream = new SwooleStream((string) $throwable->getMessage());
+        $stream = new SwooleStream($throwable->getMessage());
         return $response->withBody($stream);
     }
 

src/Listener/InitSenderListener.php

@@ -18,14 +18,8 @@
 
 class InitSenderListener implements ListenerInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    public function __construct(ContainerInterface $container)
+    public function __construct(private ContainerInterface $container)
     {
-        $this->container = $container;
     }
 
     /**

src/Listener/OnPipeMessageListener.php

@@ -21,26 +21,8 @@
 
 class OnPipeMessageListener implements ListenerInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    /**
-     * @var StdoutLoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var Sender
-     */
-    private $sender;
-
-    public function __construct(ContainerInterface $container, StdoutLoggerInterface $logger, Sender $sender)
+    public function __construct(private ContainerInterface $container, private StdoutLoggerInterface $logger, private Sender $sender)
     {
-        $this->container = $container;
-        $this->logger = $logger;
-        $this->sender = $sender;
     }
 
     /**

src/Sender.php

@@ -16,6 +16,7 @@
 use Hyperf\Server\CoroutineServer;
 use Hyperf\WebSocketServer\Exception\InvalidMethodException;
 use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
 use Swoole\Http\Response;
 use Swoole\Server;
 
@@ -25,34 +26,19 @@
  */
 class Sender
 {
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
+    protected LoggerInterface $logger;
 
-    /**
-     * @var StdoutLoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @var int
-     */
-    protected $workerId;
+    protected ?int $workerId = null;
 
     /**
      * @var Response[]
      */
-    protected $responses = [];
+    protected array $responses = [];
 
-    /**
-     * @var bool
-     */
-    protected $isCoroutineServer = false;
+    protected bool $isCoroutineServer = false;
 
-    public function __construct(ContainerInterface $container)
+    public function __construct(protected ContainerInterface $container)
     {
-        $this->container = $container;
         $this->logger = $container->get(StdoutLoggerInterface::class);
         if ($config = $container->get(ConfigInterface::class)) {
             $this->isCoroutineServer = $config->get('server.type') === CoroutineServer::class;

src/SenderPipeMessage.php

@@ -13,19 +13,7 @@
 
 class SenderPipeMessage
 {
-    /**
-     * @var string
-     */
-    public $name;
-
-    /**
-     * @var array
-     */
-    public $arguments;
-
-    public function __construct(string $name, array $arguments)
+    public function __construct(public string $name, public array $arguments)
     {
-        $this->name = $name;
-        $this->arguments = $arguments;
     }
 }

src/Server.php

@@ -50,68 +50,21 @@
 
 class Server implements MiddlewareInitializerInterface, OnHandShakeInterface, OnCloseInterface, OnMessageInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * @var HttpDispatcher
-     */
-    protected $dispatcher;
-
-    /**
-     * @var ExceptionHandlerDispatcher
-     */
-    protected $exceptionHandlerDispatcher;
+    protected ?CoreMiddlewareInterface $coreMiddleware = null;
 
-    /**
-     * @var CoreMiddlewareInterface
-     */
-    protected $coreMiddleware;
+    protected array $exceptionHandlers = [];
 
-    /**
-     * @var array
-     */
-    protected $exceptionHandlers;
+    protected array $middlewares = [];
 
-    /**
-     * @var ResponseEmitter
-     */
-    protected $responseEmitter;
-
-    /**
-     * @var StdoutLoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @var array
-     */
-    protected $middlewares = [];
-
-    /**
-     * @var string
-     */
-    protected $serverName = 'websocket';
+    protected string $serverName = 'websocket';
 
     /**
      * @var null|\Swoole\Coroutine\Http\Server|WebSocketServer
      */
-    protected $server;
-
-    public function __construct(
-        ContainerInterface $container,
-        HttpDispatcher $dispatcher,
-        ExceptionHandlerDispatcher $exceptionHandlerDispatcher,
-        ResponseEmitter $responseEmitter,
-        StdoutLoggerInterface $logger
-    ) {
-        $this->container = $container;
-        $this->dispatcher = $dispatcher;
-        $this->exceptionHandlerDispatcher = $exceptionHandlerDispatcher;
-        $this->responseEmitter = $responseEmitter;
-        $this->logger = $logger;
+    protected mixed $server;
+
+    public function __construct(protected ContainerInterface $container, protected HttpDispatcher $dispatcher, protected ExceptionHandlerDispatcher $exceptionHandlerDispatcher, protected ResponseEmitter $responseEmitter, protected StdoutLoggerInterface $logger)
+    {
     }
 
     public function initCoreMiddleware(string $serverName): void
@@ -126,10 +79,7 @@ public function initCoreMiddleware(string $serverName): void
         ]);
     }
 
-    /**
-     * @return \Swoole\Coroutine\Http\Server|WebSocketServer
-     */
-    public function getServer()
+    public function getServer(): \Swoole\Coroutine\Http\Server|WebSocketServer
     {
         if ($this->server) {
             return $this->server;
@@ -282,10 +232,9 @@ protected function getFd($response): int
     }
 
     /**
-     * @param SwooleResponse|WebSocketServer $server
      * @param mixed $request
      */
-    protected function deferOnOpen($request, string $class, $server)
+    protected function deferOnOpen($request, string $class, SwooleResponse|WebSocketServer $server)
     {
         $instance = $this->container->get($class);
         wait(static function () use ($request, $instance, $server) {