Skip to content

Use the response factory instead of Guzzle for error response #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clue merged 1 commit into from
Jul 28, 2026
+39 −2
Merged

Use the response factory instead of Guzzle for error response #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Handshake/ServerNegotiator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
namespace Ratchet\RFC6455\Handshake;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseFactoryInterface;
use GuzzleHttp\Psr7\Response;
use Psr\Http\Message\ResponseInterface;

/**
Expand Down Expand Up @@ -127,7 +126,7 @@ public function handshake(RequestInterface $request): ResponseInterface {
try {
$perMessageDeflateRequest = PermessageDeflateOptions::fromRequestOrResponse($request)[0];
} catch (InvalidPermessageDeflateOptionsException $e) {
return new Response(400, [], null, '1.1', $e->getMessage());
return $this->responseFactory->createResponse(400, $e->getMessage());
}

if ($this->enablePerMessageDeflate && $perMessageDeflateRequest->isEnabled()) {
Expand Down
38 changes: 38 additions & 0 deletions tests/unit/Handshake/ServerNegotiatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\HttpFactory;
use Psr\Http\Message\ResponseFactoryInterface;
use Ratchet\RFC6455\Handshake\RequestVerifier;
use Ratchet\RFC6455\Handshake\ServerNegotiator;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -124,6 +125,43 @@ public function testInvalidSecWebsocketVersion(): void {
$this->assertEquals('13', $response->getHeaderLine('Sec-WebSocket-Version'));
}

public function testInvalidPermessageDeflate(): void {
$responseFactory = $this->createMock(ResponseFactoryInterface::class);
$responseFactory->expects($this->exactly(2))
->method('createResponse')
->willReturnOnConsecutiveCalls(
(new HttpFactory())->createResponse(),
(new HttpFactory())->createResponse(400, 'server_max_window_bits must have a value between 8 and 15.')
);

$negotiator = new ServerNegotiator(new RequestVerifier(), $responseFactory);

$requestText = 'GET / HTTP/1.1
Host: 127.0.0.1:6789
Connection: Upgrade
Pragma: no-cache
Cache-Control: no-cache
Upgrade: websocket
Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
Sec-WebSocket-Version: 13
Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=99
Upgrade-Insecure-Requests: 1
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36
Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8
Accept-Encoding: gzip, deflate, sdch, br
Accept-Language: en-US,en;q=0.8

';

$request = Message::parseRequest($requestText);

$response = $negotiator->handshake($request);

$this->assertEquals('1.1', $response->getProtocolVersion());
$this->assertEquals(400, $response->getStatusCode());
$this->assertEquals('server_max_window_bits must have a value between 8 and 15.', $response->getReasonPhrase());
}

public function testBadSubprotocolResponse(): void {
$negotiator = new ServerNegotiator(new RequestVerifier(), new HttpFactory());
$negotiator->setStrictSubProtocolCheck(true);
Expand Down