mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 20:24:08 +02:00
Code Issues Releases Wiki Activity

[ticket/17176] Resolve deprecation notices

Browse Source 
PHPBB3-17176
This commit is contained in:
Marc Alexander
2023-08-19 22:05:37 +02:00
parent daf30b89f1
commit abd29e96b5
22 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/mock/request.php
View File

@@ -41,13 +41,13 @@ class phpbb_mock_request extends \phpbb\request\request
public function variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST)
{
return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
return $this->data[$super_global][$var_name] ?? $default;
}
public function server($var_name, $default = '')
{
$super_global = \phpbb\request\request_interface::SERVER;
return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
return $this->data[$super_global][$var_name] ?? $default;
}
public function header($header_name, $default = '')
@@ -115,7 +115,7 @@ class phpbb_mock_request extends \phpbb\request\request
$this->data[\phpbb\request\request_interface::SERVER][$var_name] = $value;
}
public function merge($super_global = \phpbb\request\request_interface::REQUEST, $values)
public function merge($values, $super_global = \phpbb\request\request_interface::REQUEST): void
{
$this->data[$super_global] = array_merge($this->data[$super_global], $values);
}