Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-12 02:09:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Raised minimum PHP version to 8.1 (#19879)

Browse Source
This commit is contained in:
Wilmer Arambula
2023-07-10 09:48:32 -04:00
committed by GitHub
parent b9e5a87f54
commit 2e37b5c87d
226 changed files with 2292 additions and 2053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@ class RequestTest extends TestCase
$request->enableCsrfCookie = false;
$token = $request->getCsrfToken();
$this->assertRegExp('~[-_=a-z0-9]~i', $token);
$this->assertMatchesRegularExpression('~[-_=a-z0-9]~i', $token);
}
public function testCsrfTokenValidation()
@@ -267,7 +267,7 @@ class RequestTest extends TestCase
$this->assertEquals($_GET, ['id' => 63]);
}
public function getHostInfoDataProvider()
public static function getHostInfoDataProvider()
{
return [
// empty
@@ -430,25 +430,23 @@ class RequestTest extends TestCase
$this->assertSame('servername.com', $request->getHostName());
}
/**
* @expectedException \yii\base\InvalidConfigException
*/
public function testGetScriptFileWithEmptyServer()
{
$request = new Request();
$_SERVER = [];
$this->expectException(\yii\base\InvalidConfigException::class);
$request->getScriptFile();
}
/**
* @expectedException \yii\base\InvalidConfigException
*/
public function testGetScriptUrlWithEmptyServer()
{
$request = new Request();
$_SERVER = [];
$this->expectException(\yii\base\InvalidConfigException::class);
$request->getScriptUrl();
}
@@ -474,7 +472,7 @@ class RequestTest extends TestCase
$this->assertNull($request->getServerPort());
}
public function isSecureServerDataProvider()
public static function isSecureServerDataProvider()
{
return [
[['HTTPS' => 1], true],
@@ -602,7 +600,7 @@ class RequestTest extends TestCase
$_SERVER = $original;
}
public function isSecureServerWithoutTrustedHostDataProvider()
public static function isSecureServerWithoutTrustedHostDataProvider()
{
return [
// RFC 7239 forwarded header is not enabled
@@ -641,7 +639,7 @@ class RequestTest extends TestCase
$_SERVER = $original;
}
public function getUserIPDataProvider()
public static function getUserIPDataProvider()
{
return [
[
@@ -819,7 +817,7 @@ class RequestTest extends TestCase
$_SERVER = $original;
}
public function getUserIPWithoutTruestHostDataProvider()
public static function getUserIPWithoutTruestHostDataProvider()
{
return [
// RFC 7239 forwarded is not enabled
@@ -861,7 +859,7 @@ class RequestTest extends TestCase
$_SERVER = $original;
}
public function getMethodDataProvider()
public static function getMethodDataProvider()
{
return [
[
@@ -895,7 +893,7 @@ class RequestTest extends TestCase
$_SERVER = $original;
}
public function getIsAjaxDataProvider()
public static function getIsAjaxDataProvider()
{
return [
[
@@ -927,7 +925,7 @@ class RequestTest extends TestCase
$_SERVER = $original;
}
public function getIsPjaxDataProvider()
public static function getIsPjaxDataProvider()
{
return [
[
@@ -971,7 +969,7 @@ class RequestTest extends TestCase
$this->assertNull($request->getOrigin());
}
public function httpAuthorizationHeadersProvider()
public static function httpAuthorizationHeadersProvider()
{
return [
['not a base64 at all', [base64_decode('not a base64 at all'), null]],
@@ -1050,7 +1048,7 @@ class RequestTest extends TestCase
$this->assertSame('default', $request->getBodyParam('unexisting', 'default'));
}
public function getBodyParamsDataProvider()
public static function getBodyParamsDataProvider()
{
return [
'json' => ['application/json', '{"foo":"bar","baz":1}', ['foo' => 'bar', 'baz' => 1]],
@@ -1111,7 +1109,7 @@ class RequestTest extends TestCase
$this->assertSame($expectedUserIp, $request->getUserIP());
}
public function trustedHostAndXForwardedPortDataProvider()
public static function trustedHostAndXForwardedPortDataProvider()
{
return [
'defaultPlain' => ['1.1.1.1', 80, null, null, 80],
@@ -1155,7 +1153,7 @@ class RequestTest extends TestCase
$this->assertSame($expectedMethod, $request->getMethod());
}
public function alreadyResolvedIpDataProvider() {
public static function alreadyResolvedIpDataProvider() {
return [
'resolvedXForwardedFor' => [
'50.0.0.1',
@@ -1196,7 +1194,7 @@ class RequestTest extends TestCase
$this->assertSame($expectedIsSecureConnection, $request->isSecureConnection, 'Secure connection fail!');
}
public function parseForwardedHeaderDataProvider()
public static function parseForwardedHeaderDataProvider()
{
return [
[