mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/17135] Fix rebasing issues

Browse Source 
PHPBB-17135
This commit is contained in:
rxu
2024-06-05 10:16:05 +07:00
parent 068987eba6
commit 51fae82718
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/messenger/method/base.php
View File

@@ -22,6 +22,7 @@ use phpbb\log\log_interface;
use phpbb\path_helper;
use phpbb\request\request;
use phpbb\messenger\queue;
use phpbb\template\assets_bag;
use phpbb\template\twig\lexer;
use phpbb\user;
@@ -33,6 +34,9 @@ abstract class base
/** @var array */
protected $additional_headers = [];
/** @var assets_bag */
protected $assets_bag;
/** @var config */
protected $config;
@@ -87,6 +91,7 @@ abstract class base
/**
* Messenger base class constructor
*
* @param assets_bag $assets_bag
* @param config $config
* @param dispatcher $dispatcher
* @param language $language
@@ -102,6 +107,7 @@ abstract class base
* @param string $phpbb_root_path
*/
function __construct(
assets_bag $assets_bag,
config $config,
dispatcher $dispatcher,
language $language,
@@ -117,6 +123,7 @@ abstract class base
$phpbb_root_path
)
{
$this->assets_bag = $assets_bag;
$this->config = $config;
$this->dispatcher = $dispatcher;
$this->language = $language;
@@ -472,6 +479,7 @@ abstract class base
}
$template_environment = new \phpbb\template\twig\environment(
$this->assets_bag,
$this->config,
new \phpbb\filesystem\filesystem(),
$this->path_helper,