Skip to content

refactor(tests): Move server parameter tests to new ServerParamsPsr7Test class for better organization and clarity. #72

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
merged 2 commits into from
Aug 9, 2025
Merged

refactor(tests): Move server parameter tests to new ServerParamsPsr7Test class for better organization and clarity. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
147836f
refactor(tests): Move server parameter tests to new `ServerParamsPsr7…
terabytesoftw Aug 9, 2025
017d078
Apply fixed review coderabbitai nitpick comments.
terabytesoftw Aug 9, 2025
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
126 changes: 126 additions & 0 deletions tests/adapter/ServerParamsPsr7Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<?php

declare(strict_types=1);

namespace yii2\extensions\psrbridge\tests\adapter;

use PHPUnit\Framework\Attributes\Group;
use yii2\extensions\psrbridge\http\Request;
use yii2\extensions\psrbridge\tests\support\FactoryHelper;
use yii2\extensions\psrbridge\tests\TestCase;

#[Group('http')]
#[Group('psr7-request')]
#[Group('server-params')]
final class ServerParamsPsr7Test extends TestCase
{
public function testReturnEmptyServerParamsWhenAdapterIsSet(): void
{
$_SERVER = [
'REMOTE_ADDR' => '192.168.1.100',
'REQUEST_TIME' => '1234567890',
'SERVER_NAME' => 'old.example.com',
];

$request = new Request();

$request->setPsr7Request(
FactoryHelper::createRequest('GET', 'https://old.example.com/api'),
);

self::assertEmpty(
$request->getServerParams(),
'Server parameters should be an empty array when using a PSR-7 request, ignoring global $_SERVER.',
);
}

public function testReturnServerParamsFromPsr7RequestOverridesGlobalServer(): void
{
$_SERVER = [
'REMOTE_ADDR' => '192.168.1.100',
'REQUEST_TIME' => '1234567890',
'SERVER_NAME' => 'old.example.com',
];

$request = new Request();

$request->setPsr7Request(
FactoryHelper::createRequest(
'GET',
'https://old.example.com/api',
serverParams: [
'HTTP_X_FORWARDED_FOR' => '203.0.113.1',
'REMOTE_ADDR' => '10.0.0.50',
'REQUEST_TIME' => null,
'SERVER_NAME' => 'new.example.com',
],
),
);

$serverParams = $request->getServerParams();

self::assertCount(
4,
$serverParams,
"Only parameters present in PSR-7 'serverParams' should be returned.",
);
self::assertSame(
'203.0.113.1',
$serverParams['HTTP_X_FORWARDED_FOR'] ?? null,
"'HTTP_X_FORWARDED_FOR' should be taken from PSR-7 'serverParams'.",
);
self::assertSame(
'10.0.0.50',
$serverParams['REMOTE_ADDR'] ?? null,
"Server parameter 'REMOTE_ADDR' should be taken from PSR-7 'serverParams', not from global \$_SERVER.",
);
self::assertNull(
$serverParams['REQUEST_TIME'] ?? null,
"Server parameter 'REQUEST_TIME' should be 'null' when explicitly set to 'null' in PSR-7 'serverParams', " .
'even if present in global $_SERVER.',
);
self::assertSame(
'new.example.com',
$serverParams['SERVER_NAME'] ?? null,
"'SERVER_NAME' should be taken from PSR-7 'serverParams'.",
);
}

public function testReturnServerParamsFromPsr7RequestWhenAdapterIsSet(): void
{
$request = new Request();

$request->setPsr7Request(
FactoryHelper::createRequest(
'GET',
'https://old.example.com/api',
serverParams: [
'HTTP_X_FORWARDED_FOR' => '203.0.113.1',
'REQUEST_TIME' => '1234567890',
],
),
);

$serverParams = $request->getServerParams();

self::assertCount(
2,
$serverParams,
"Only parameters present in PSR-7 'serverParams' should be returned.",
);
self::assertSame(
'203.0.113.1',
$serverParams['HTTP_X_FORWARDED_FOR'] ?? null,
"'HTTP_X_FORWARDED_FOR' should match the value from PSR-7 'serverParams'.",
);
self::assertSame(
'1234567890',
$serverParams['REQUEST_TIME'] ?? null,
"'REQUEST_TIME' should match the value from PSR-7 'serverParams'.",
);
self::assertNull(
$serverParams['REMOTE_ADDR'] ?? null,
"'REMOTE_ADDR' should not be set when not present in PSR-7 'serverParams'.",
);
}
}
90 changes: 0 additions & 90 deletions tests/adapter/ServerRequestAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,26 +587,6 @@ public function testReturnEmptyScriptUrlWhenAdapterIsSetInWorkerMode(): void
);
}

public function testReturnEmptyServerParamsWhenAdapterIsSet(): void
{
$_SERVER = [
'REMOTE_ADDR' => '192.168.1.100',
'REQUEST_TIME' => '1234567890',
'SERVER_NAME' => 'old.example.com',
];

$request = new Request();

$request->setPsr7Request(
FactoryHelper::createRequest('GET', 'https://old.example.com/api'),
);

self::assertEmpty(
$request->getServerParams(),
'Server parameters should be an empty array when using a PSR-7 request, ignoring global $_SERVER.',
);
}

public function testReturnEmptyStringFromHeaderWhenCsrfHeaderPresentButEmpty(): void
{
$request = new Request();
Expand Down Expand Up @@ -1550,76 +1530,6 @@ public function testReturnServerParamFromPsr7RequestWhenAdapterIsSet(): void
);
}

public function testReturnServerParamsFromPsr7RequestOverridesGlobalServer(): void
{
$_SERVER = [
'REMOTE_ADDR' => '192.168.1.100',
'REQUEST_TIME' => '1234567890',
'SERVER_NAME' => 'old.example.com',
];

$request = new Request();

$request->setPsr7Request(
FactoryHelper::createRequest(
'GET',
'https://old.example.com/api',
serverParams: [
'HTTP_X_FORWARDED_FOR' => '203.0.113.1',
'REMOTE_ADDR' => '10.0.0.50',
'REQUEST_TIME' => null,
'SERVER_NAME' => 'new.example.com',
],
),
);

$serverParams = $request->getServerParams();

self::assertSame(
'10.0.0.50',
$serverParams['REMOTE_ADDR'] ?? null,
"Server parameter 'REMOTE_ADDR' should be taken from PSR-7 'serverParams', not from global \$_SERVER.",
);
self::assertNull(
$serverParams['REQUEST_TIME'] ?? null,
"Server parameter 'REQUEST_TIME' should be 'null' when not set in PSR-7 'serverParams', even if present " .
'in global $_SERVER.',
);
}

public function testReturnServerParamsFromPsr7RequestWhenAdapterIsSet(): void
{
$request = new Request();

$request->setPsr7Request(
FactoryHelper::createRequest(
'GET',
'https://old.example.com/api',
serverParams: [
'HTTP_X_FORWARDED_FOR' => '203.0.113.1',
'REQUEST_TIME' => '1234567890',
],
),
);

$serverParams = $request->getServerParams();

self::assertSame(
'203.0.113.1',
$serverParams['HTTP_X_FORWARDED_FOR'] ?? null,
"'HTTP_X_FORWARDED_FOR' should match the value from PSR-7 'serverParams'.",
);
self::assertSame(
'1234567890',
$serverParams['REQUEST_TIME'] ?? null,
"'REQUEST_TIME' should match the value from PSR-7 'serverParams'.",
);
self::assertNull(
$serverParams['REMOTE_ADDR'] ?? null,
"'REMOTE_ADDR' should not be set when not present in PSR-7 'serverParams'.",
);
}

public function testReturnUploadedFilesRecursivelyConvertsNestedArrays(): void
{
$file1 = dirname(__DIR__) . '/support/stub/files/test1.txt';
Expand Down
Loading