Remove unnecessary exception comments

walkor · Oct 9, 2024 · dc35e03 · dc35e03
1 parent 620346c
commit dc35e03
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 119 deletions.
diff --git a/src/Connection/AsyncTcpConnection.php b/src/Connection/AsyncTcpConnection.php
@@ -154,7 +154,6 @@ class AsyncTcpConnection extends TcpConnection
      *
      * @param string $remoteAddress
      * @param array $socketContext
-     * @throws Exception
      */
     public function __construct(string $remoteAddress, array $socketContext = [])
     {
@@ -195,7 +194,7 @@ public function __construct(string $remoteAddress, array $socketContext = [])
             if (!class_exists($this->protocol)) {
                 $this->protocol = "\\Workerman\\Protocols\\$scheme";
                 if (!class_exists($this->protocol)) {
-                    throw new Exception("class \\Protocols\\$scheme not exist");
+                    throw new RuntimeException("class \\Protocols\\$scheme not exist");
                 }
             }
         } else {
@@ -216,7 +215,6 @@ public function __construct(string $remoteAddress, array $socketContext = [])
      *
      * @param int $after
      * @return void
-     * @throws Throwable
      */
     public function reconnect(int $after = 0): void
     {
@@ -236,7 +234,6 @@ public function reconnect(int $after = 0): void
      * Do connect.
      *
      * @return void
-     * @throws Throwable
      */
     public function connect(): void
     {
@@ -302,7 +299,6 @@ public function connect(): void
      * @param int $code
      * @param mixed $msg
      * @return void
-     * @throws Throwable
      */
     protected function emitError(int $code, mixed $msg): void
     {
@@ -351,7 +347,6 @@ public function getRemoteURI(): string
      * Check connection is successfully established or failed.
      *
      * @return void
-     * @throws Throwable
      */
     public function checkConnection(): void
     {

diff --git a/src/Connection/AsyncUdpConnection.php b/src/Connection/AsyncUdpConnection.php
@@ -17,6 +17,7 @@
 namespace Workerman\Connection;
 
 use Exception;
+use RuntimeException;
 use Throwable;
 use Workerman\Protocols\ProtocolInterface;
 use Workerman\Worker;
@@ -70,7 +71,7 @@ class AsyncUdpConnection extends UdpConnection
      * Construct.
      *
      * @param string $remoteAddress
-     * @throws Exception
+     * @throws Throwable
      */
     public function __construct($remoteAddress, $contextOption = [])
     {
@@ -83,7 +84,7 @@ public function __construct($remoteAddress, $contextOption = [])
             if (!class_exists($this->protocol)) {
                 $this->protocol = "\\Workerman\\Protocols\\$scheme";
                 if (!class_exists($this->protocol)) {
-                    throw new Exception("class \\Protocols\\$scheme not exist");
+                    throw new RuntimeException("class \\Protocols\\$scheme not exist");
                 }
             }
         }
@@ -97,7 +98,6 @@ public function __construct($remoteAddress, $contextOption = [])
      *
      * @param resource $socket
      * @return void
-     * @throws Throwable
      */
     public function baseRead($socket): void
     {
@@ -127,7 +127,6 @@ public function baseRead($socket): void
      * @param mixed $data
      * @param bool $raw
      * @return void
-     * @throws Throwable
      */
     public function close(mixed $data = null, bool $raw = false): void
     {
@@ -154,7 +153,6 @@ public function close(mixed $data = null, bool $raw = false): void
      * @param mixed $sendBuffer
      * @param bool $raw
      * @return bool|null
-     * @throws Throwable
      */
     public function send(mixed $sendBuffer, bool $raw = false): bool|null
     {
@@ -176,7 +174,6 @@ public function send(mixed $sendBuffer, bool $raw = false): bool|null
      * Connect.
      *
      * @return void
-     * @throws Throwable
      */
     public function connect(): void
     {

diff --git a/src/Connection/ConnectionInterface.php b/src/Connection/ConnectionInterface.php
@@ -170,7 +170,6 @@ abstract public function isIpV6(): bool;
     /**
      * @param Throwable $exception
      * @return void
-     * @throws Throwable
      */
     public function error(Throwable $exception): void
     {
@@ -181,11 +180,8 @@ public function error(Throwable $exception): void
         try {
             ($this->errorHandler)($exception);
         } catch (Throwable $exception) {
-            if ($this->eventLoop instanceof Event) {
-                echo $exception;
-                return;
-            }
-            throw $exception;
+            Worker::stopAll(250, $exception);
+            return;
         }
     }
 }
diff --git a/src/Connection/TcpConnection.php b/src/Connection/TcpConnection.php
@@ -400,7 +400,6 @@ public function getStatus(bool $rawOutput = true): int|string
      * @param mixed $sendBuffer
      * @param bool $raw
      * @return bool|null
-     * @throws Throwable
      */
     public function send(mixed $sendBuffer, bool $raw = false): bool|null
     {
@@ -414,7 +413,7 @@ public function send(mixed $sendBuffer, bool $raw = false): bool|null
             $parser = $this->protocol;
             try {
                 $sendBuffer = $parser::encode($sendBuffer, $this);
-            } catch(\Throwable $e) {
+            } catch(Throwable $e) {
                 $this->error($e);
             }
             if ($sendBuffer === '') {
@@ -605,7 +604,6 @@ public function pauseRecv(): void
      * Resumes reading after a call to pauseRecv.
      *
      * @return void
-     * @throws Throwable
      */
     public function resumeRecv(): void
     {
@@ -623,7 +621,6 @@ public function resumeRecv(): void
      * @param resource $socket
      * @param bool $checkEof
      * @return void
-     * @throws Throwable
      */
     public function baseRead($socket, bool $checkEof = true): void
     {
@@ -764,7 +761,6 @@ public function baseRead($socket, bool $checkEof = true): void
      * Base write handler.
      *
      * @return void
-     * @throws Throwable
      */
     public function baseWrite(): void
     {
@@ -811,7 +807,6 @@ public function baseWrite(): void
      *
      * @param resource $socket
      * @return bool|int
-     * @throws Throwable
      */
     public function doSslHandshake($socket): bool|int
     {
@@ -898,7 +893,6 @@ public function consumeRecvBuffer(int $length): void
      * @param mixed $data
      * @param bool $raw
      * @return void
-     * @throws Throwable
      */
     public function close(mixed $data = null, bool $raw = false): void
     {
@@ -964,7 +958,6 @@ public function getSocket()
      * Check whether send buffer will be full.
      *
      * @return void
-     * @throws Throwable
      */
     protected function checkBufferWillFull(): void
     {
@@ -981,7 +974,6 @@ protected function checkBufferWillFull(): void
      * Whether send buffer is full.
      *
      * @return bool
-     * @throws Throwable
      */
     protected function bufferIsFull(): bool
     {
@@ -1013,7 +1005,6 @@ public function bufferIsEmpty(): bool
      * Destroy connection.
      *
      * @return void
-     * @throws Throwable
      */
     public function destroy(): void
     {
@@ -1101,7 +1092,6 @@ public function jsonSerialize(): array
      * Destruct.
      *
      * @return void
-     * @throws Throwable
      */
     public function __destruct()
     {

diff --git a/src/Events/Select.php b/src/Events/Select.php
@@ -16,6 +16,8 @@
 
 namespace Workerman\Events;
 
+use SplPriorityQueue;
+use Throwable;
 use function count;
 use function max;
 use function microtime;
@@ -86,9 +88,9 @@ final class Select implements EventInterface
      * Timer scheduler.
      * {['data':timer_id, 'priority':run_timestamp], ..}
      *
-     * @var \SplPriorityQueue
+     * @var SplPriorityQueue
      */
-    private \SplPriorityQueue $scheduler;
+    private SplPriorityQueue $scheduler;
 
     /**
      * All timer event listeners.
@@ -122,8 +124,8 @@ final class Select implements EventInterface
      */
     public function __construct()
     {
-        $this->scheduler = new \SplPriorityQueue();
-        $this->scheduler->setExtractFlags(\SplPriorityQueue::EXTR_BOTH);
+        $this->scheduler = new SplPriorityQueue();
+        $this->scheduler->setExtractFlags(SplPriorityQueue::EXTR_BOTH);
     }
 
     /**
@@ -299,7 +301,6 @@ public function offSignal(int $signal): bool
      * Tick for timer.
      *
      * @return void
-     * @throws \Throwable
      */
     protected function tick(): void
     {
@@ -349,8 +350,8 @@ protected function tick(): void
      */
     public function deleteAllTimer(): void
     {
-        $this->scheduler = new \SplPriorityQueue();
-        $this->scheduler->setExtractFlags(\SplPriorityQueue::EXTR_BOTH);
+        $this->scheduler = new SplPriorityQueue();
+        $this->scheduler->setExtractFlags(SplPriorityQueue::EXTR_BOTH);
         $this->eventTimer = [];
     }
 
@@ -367,7 +368,7 @@ public function run(): void
                 // Waiting read/write/signal/timeout events.
                 try {
                     @stream_select($read, $write, $except, 0, $this->selectTimeout);
-                } catch (\Throwable) {
+                } catch (Throwable) {
                     // do nothing
                 }
             } else {
@@ -450,7 +451,7 @@ private function safeCall(callable $func, array $args = []): void
     {
         try {
             $func(...$args);
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             if ($this->errorHandler === null) {
                 echo $e;
             } else {

diff --git a/src/Protocols/Http.php b/src/Protocols/Http.php
@@ -86,7 +86,7 @@ public static function requestClass(?string $className = null): string
      *
      * @param bool $value
      */
-    public static function enableCache(bool $value)
+    public static function enableCache(bool $value): void
     {
         static::$enableCache = $value;
     }
@@ -97,7 +97,6 @@ public static function enableCache(bool $value)
      * @param string $buffer
      * @param TcpConnection $connection
      * @return int
-     * @throws Throwable
      */
     public static function input(string $buffer, TcpConnection $connection): int
     {
@@ -194,7 +193,6 @@ public static function decode(string $buffer, TcpConnection $connection): Reques
      * @param string|Response $response
      * @param TcpConnection $connection
      * @return string
-     * @throws Throwable
      */
     public static function encode(mixed $response, TcpConnection $connection): string
     {
@@ -266,7 +264,6 @@ public static function encode(mixed $response, TcpConnection $connection): strin
      * @param resource $handler
      * @param int $offset
      * @param int $length
-     * @throws Throwable
      */
     protected static function sendStream(TcpConnection $connection, $handler, int $offset = 0, int $length = 0): void
     {

diff --git a/src/Protocols/Http/Request.php b/src/Protocols/Http/Request.php
@@ -226,7 +226,7 @@ public function cookie(string $name = null, mixed $default = null): mixed
             $mapped = array();
 
             foreach ($cookies as $cookie) {
-                $cookie = explode('=', $cookie);
+                $cookie = explode('=', $cookie, 2);
                 if (count($cookie) !== 2) {
                     continue;
                 }
@@ -678,7 +678,7 @@ protected function parseUploadFile(string $boundary, int $sectionStartOffset, st
                     break;
 
                 case "webkitrelativepath":
-                    $file['full_path'] = \trim($value);
+                    $file['full_path'] = trim($value);
                     break;
             }
         }

diff --git a/src/Protocols/Http/Session.php b/src/Protocols/Http/Session.php
@@ -17,6 +17,7 @@
 namespace Workerman\Protocols\Http;
 
 use Exception;
+use Random\RandomException;
 use RuntimeException;
 use Workerman\Protocols\Http\Session\FileSessionHandler;
 use Workerman\Protocols\Http\Session\SessionHandlerInterface;
@@ -153,7 +154,7 @@ class Session
      *
      * @var bool
      */
-    protected $isSafe = true;
+    protected bool $isSafe = true;
 
     /**
      * Session constructor.
@@ -437,7 +438,7 @@ public function __wakeup()
      * __destruct.
      *
      * @return void
-     * @throws Exception
+     * @throws RandomException
      */
     public function __destruct()
     {