php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 05:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix codestyle in build and tests (#20586)

Browse Source
This commit is contained in:
Maksim Spirkov
2025-10-10 23:04:09 +03:00
committed by GitHub
parent 8005113753
commit 909396074e
361 changed files with 1422 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/framework/web/RequestTest.php
View File

@ -1,4 +1,5 @@
<?php
/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
@ -152,8 +153,8 @@ class RequestTest extends TestCase
// When an empty CSRF token is given it is regenerated.
$this->assertNotEmpty($request->getCsrfToken());
}
/**
* Test CSRF token validation by POST param.
*/
@ -534,7 +535,6 @@ class RequestTest extends TestCase
$_SERVER = $original;
}
public function testSetHostInfo()
{
$request = new Request();
@ -564,7 +564,7 @@ class RequestTest extends TestCase
$_SERVER = [];
$this->expectException(\yii\base\InvalidConfigException::class);
$request->getScriptUrl();
}
@ -954,28 +954,28 @@ class RequestTest extends TestCase
* @param array $server
* @param string $expected
*/
public function testGetUserIPWithoutTrustedHost($server, $expected)
{
$original = $_SERVER;
$_SERVER = $server;
public function testGetUserIPWithoutTrustedHost($server, $expected)
{
$original = $_SERVER;
$_SERVER = $server;
$request = new Request([
'trustedHosts' => [
'192.168.0.0/24' => ['X-Forwarded-For'],
],
'secureHeaders' => [
'Front-End-Https',
'X-Rewrite-Url',
'X-Forwarded-For',
'X-Forwarded-Host',
'X-Forwarded-Proto',
'forwarded',
],
]);
$this->assertEquals($expected, $request->getUserIP());
$request = new Request([
'trustedHosts' => [
'192.168.0.0/24' => ['X-Forwarded-For'],
],
'secureHeaders' => [
'Front-End-Https',
'X-Rewrite-Url',
'X-Forwarded-For',
'X-Forwarded-Host',
'X-Forwarded-Proto',
'forwarded',
],
]);
$this->assertEquals($expected, $request->getUserIP());
$_SERVER = $original;
}
$_SERVER = $original;
}
public function getMethodDataProvider()
{
@ -1220,7 +1220,7 @@ class RequestTest extends TestCase
$params = [
'trustedHosts' => $trustedHosts,
];
if($ipHeaders !== null) {
if ($ipHeaders !== null) {
$params['ipHeaders'] = $ipHeaders;
}
$request = new Request($params);
@ -1271,7 +1271,8 @@ class RequestTest extends TestCase
$this->assertSame($expectedMethod, $request->getMethod());
}
public function alreadyResolvedIpDataProvider() {
public function alreadyResolvedIpDataProvider()
{
return [
'resolvedXForwardedFor' => [
'50.0.0.1',
@ -1299,7 +1300,8 @@ class RequestTest extends TestCase
/**
* @dataProvider alreadyResolvedIpDataProvider
*/
public function testAlreadyResolvedIp($remoteAddress, $xForwardedFor, $xForwardedProto, $trustedHosts, $expectedRemoteAddress, $expectedUserIp, $expectedIsSecureConnection) {
public function testAlreadyResolvedIp($remoteAddress, $xForwardedFor, $xForwardedProto, $trustedHosts, $expectedRemoteAddress, $expectedUserIp, $expectedIsSecureConnection)
{
$_SERVER['REMOTE_ADDR'] = $remoteAddress;
$_SERVER['HTTP_X_FORWARDED_FOR'] = $xForwardedFor;
$_SERVER['HTTP_X_FORWARDED_PROTO'] = $xForwardedProto;