From 2132904e00c0fe0e80fdadce37c25bbc5ded7b4b Mon Sep 17 00:00:00 2001 From: Bosun Egberinde <15146515+bosunski@users.noreply.github.com> Date: Sun, 3 Aug 2025 22:03:36 +0200 Subject: [PATCH 1/2] Ensure getPaypload allows null --- src/WebSocket/Frame.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WebSocket/Frame.php b/src/WebSocket/Frame.php index eaa540e..f1ab5e9 100644 --- a/src/WebSocket/Frame.php +++ b/src/WebSocket/Frame.php @@ -171,7 +171,7 @@ public function withMaskingKey(string $maskingKey): static return (clone $this)->setMaskingKey($maskingKey); } - public function getPayloadData(): StreamInterface + public function getPayloadData(): ?StreamInterface { return $this->payloadData; } From 66f7579835dfda880b413607c26b409b9be30a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=93=AD=E6=98=95?= <715557344@qq.com> Date: Mon, 4 Aug 2025 10:07:12 +0800 Subject: [PATCH 2/2] Update Frame.php --- src/WebSocket/Frame.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/WebSocket/Frame.php b/src/WebSocket/Frame.php index f1ab5e9..c29a633 100644 --- a/src/WebSocket/Frame.php +++ b/src/WebSocket/Frame.php @@ -32,7 +32,7 @@ class Frame implements FrameInterface */ public const PONG = '278a0027'; - protected ?StreamInterface $payloadData = null; + protected StreamInterface $payloadData; public function __construct( protected bool $fin = true, @@ -44,9 +44,7 @@ public function __construct( protected string $maskingKey = '', mixed $payloadData = '', ) { - if ($payloadData !== null && $payloadData !== '') { - $this->setPayloadData($payloadData); - } + $this->setPayloadData($payloadData); } public function __toString() @@ -136,7 +134,7 @@ public function withRSV3(bool $rsv3): static public function getPayloadLength(): int { - return $this->payloadData?->getSize() ?? 0; + return $this->payloadData->getSize() ?? 0; } public function setPayloadLength(int $payloadLength): static @@ -171,7 +169,7 @@ public function withMaskingKey(string $maskingKey): static return (clone $this)->setMaskingKey($maskingKey); } - public function getPayloadData(): ?StreamInterface + public function getPayloadData(): StreamInterface { return $this->payloadData; }