Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions psalm.baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
<file src="src/bref/src/Runtime.php">
<InvalidArgument>
<code><![CDATA[$options]]></code>
Expand Down Expand Up @@ -50,9 +50,25 @@
<code><![CDATA[RoadRunner\Worker]]></code>
</UndefinedClass>
</file>
<file src="src/swoole-nyholm/src/RequestHandlerRunner.php">
<InvalidScalarArgument>
<code><![CDATA[$cookie->getExpiresTime()]]></code>
<code><![CDATA[$cookie->isHttpOnly()]]></code>
<code><![CDATA[$cookie->isSecure()]]></code>
</InvalidScalarArgument>
<TooManyArguments>
<code><![CDATA[cookie]]></code>
</TooManyArguments>
</file>
<file src="src/swoole/src/SymfonyHttpBridge.php">
<InvalidScalarArgument>
<code><![CDATA[$cookie->getExpiresTime()]]></code>
<code><![CDATA[$cookie->isHttpOnly()]]></code>
<code><![CDATA[$cookie->isSecure()]]></code>
<code><![CDATA[$sfResponse->getStatusCode()]]></code>
</InvalidScalarArgument>
<TooManyArguments>
<code><![CDATA[cookie]]></code>
</TooManyArguments>
</file>
</files>
</files>
19 changes: 18 additions & 1 deletion src/swoole-nyholm/src/RequestHandlerRunner.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Psr\Http\Server\RequestHandlerInterface;
use Swoole\Http\Request;
use Swoole\Http\Response;
use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\Runtime\RunnerInterface;

class RequestHandlerRunner implements RunnerInterface
Expand Down Expand Up @@ -50,12 +51,28 @@ public function handle(Request $request, Response $response): void

$response->setStatusCode($psrResponse->getStatusCode(), $psrResponse->getReasonPhrase());

foreach ($psrResponse->getHeaders() as $name => $values) {
foreach ($psrResponse->withoutHeader('set-cookies')->getHeaders() as $name => $values) {
foreach ($values as $value) {
$response->setHeader($name, $value);
}
}

if ($psrResponse->hasHeader('set-cookies')) {
foreach ($psrResponse->getHeader('set-cookies') as $cookieString) {
$cookie = Cookie::fromString($cookieString);
$response->cookie(
$cookie->getName(),
$cookie->getValue() ?? '',
$cookie->getExpiresTime(),
$cookie->getPath(),
$cookie->getDomain() ?? '',
$cookie->isSecure(),
$cookie->isHttpOnly(),
$cookie->getSameSite() ?? ''
);
}
}

$body = $psrResponse->getBody();
$body->rewind();

Expand Down
4 changes: 3 additions & 1 deletion src/swoole-nyholm/tests/Unit/RequestHandlerRunnerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public function testHandle(): void
$factory = $this->createMock(ServerFactory::class);
$application = $this->createMock(RequestHandlerInterface::class);
$psrResponse = $this->createMock(ResponseInterface::class);
$psrResponseInner = $this->createMock(ResponseInterface::class);
$request = $this->createMock(Request::class);
$response = $this->createMock(Response::class);

Expand All @@ -39,9 +40,10 @@ public function testHandle(): void

$application->expects(self::once())->method('handle')->willReturn($psrResponse);

$psrResponse->expects(self::once())->method('getHeaders')->willReturn([
$psrResponseInner->expects(self::once())->method('getHeaders')->willReturn([
'X-Test' => ['Swoole-Runtime'],
]);
$psrResponse->expects(self::once())->method('withoutHeader')->willReturn($psrResponseInner);
$psrResponse->expects(self::once())->method('getBody')->willReturn(Stream::create('Test'));
$psrResponse->expects(self::once())->method('getStatusCode')->willReturn(200);
$psrResponse->expects(self::once())->method('getReasonPhrase')->willReturn('OK');
Expand Down
15 changes: 14 additions & 1 deletion src/swoole/src/SymfonyHttpBridge.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,25 @@ public static function convertSwooleRequest(Request $request): SymfonyRequest

public static function reflectSymfonyResponse(SymfonyResponse $sfResponse, Response $response): void
{
foreach ($sfResponse->headers->all() as $name => $values) {
foreach ($sfResponse->headers->allPreserveCaseWithoutCookies() as $name => $values) {
foreach ((array) $values as $value) {
$response->header((string) $name, $value);
}
}

foreach ($sfResponse->headers->getCookies() as $cookie) {
$response->cookie(
$cookie->getName(),
$cookie->getValue() ?? '',
$cookie->getExpiresTime(),
$cookie->getPath(),
$cookie->getDomain() ?? '',
$cookie->isSecure(),
$cookie->isHttpOnly(),
$cookie->getSameSite() ?? ''
);
}

$response->status($sfResponse->getStatusCode());

switch (true) {
Expand Down
26 changes: 21 additions & 5 deletions src/swoole/tests/Unit/SymfonyHttpBridgeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\HeaderBag;
use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
use Symfony\Component\HttpFoundation\StreamedResponse;

/**
Expand Down Expand Up @@ -64,18 +64,20 @@ public function testThatSymfonyResponseIsReflected(): void
$barCookie = (string) new Cookie('bar', '234');

$sfResponse = $this->createMock(SymfonyResponse::class);
$sfResponse->headers = new HeaderBag([
$sfResponse->headers = new ResponseHeaderBag([
'X-Test' => 'Swoole-Runtime',
'Set-Cookie' => [$fooCookie, $barCookie],
'Cache-Control' => 'no-cache, private',
'Date' => 'Thu, 25 Dec 2025 19:20:06 GMT',
]);
$sfResponse->expects(self::once())->method('getStatusCode')->willReturn(201);
$sfResponse->expects(self::once())->method('getContent')->willReturn('Test');

$response = $this->createMock(Response::class);
$expectedHeaders = [
['x-test', 'Swoole-Runtime'],
['set-cookie', $fooCookie],
['set-cookie', $barCookie],
['X-Test', 'Swoole-Runtime'],
['Cache-Control', 'no-cache, private'],
['Date', 'Thu, 25 Dec 2025 19:20:06 GMT'],
];
$callCount = 0;
$response->expects(self::exactly(3))->method('header')
Expand All @@ -85,6 +87,20 @@ public function testThatSymfonyResponseIsReflected(): void
$this->assertEquals($expectedHeaders[$callCount][1], $value);
++$callCount;

return true;
});
$expectedCookies = [
['foo', '123'],
['bar', '234'],
];
$callCountCookie = 0;
$response->expects(self::exactly(2))->method('cookie')
->willReturnCallback(function ($name, $value) use ($expectedCookies, &$callCountCookie) {
$this->assertArrayHasKey($callCountCookie, $expectedCookies);
$this->assertEquals($expectedCookies[$callCountCookie][0], $name);
$this->assertEquals($expectedCookies[$callCountCookie][1], $value);
++$callCountCookie;

return true;
});
$response->expects(self::once())->method('status')->with(201);
Expand Down
Loading