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/14990] Move dispatcher object to the front of the options array

Browse Source 
PHPBB3-14990
This commit is contained in:
rxu
2017-04-16 20:53:59 +07:00
parent 1ea114ca20
commit fcc8e155ec
12 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/config/default/container/services_twig.yml
View File

@@ -11,8 +11,8 @@ services:
- '%core.template.cache_path%'
- '@ext.manager'
- '@template.twig.loader'
- []
- '@dispatcher'
- []
calls:
- [setLexer, ['@template.twig.lexer']]

2
phpBB/config/installer/container/services.yml
View File

@@ -84,8 +84,8 @@ services:
- '%core.template.cache_path%'
- null
- '@template.twig.loader'
- []
- null
- []
calls:
- [setLexer, ['@template.twig.lexer']]

4
phpBB/includes/functions_messenger.php
View File

@@ -672,8 +672,8 @@ class messenger
new \phpbb\template\twig\loader(
$phpbb_container->get('filesystem')
),
array(),
$phpbb_dispatcher
$phpbb_dispatcher,
array()
);
$template_environment->setLexer($phpbb_container->get('template.twig.lexer'));

4
phpBB/phpbb/template/twig/environment.php
View File

@@ -56,10 +56,10 @@ class environment extends \Twig_Environment
* @param string $cache_path The path to the cache directory
* @param \phpbb\extension\manager $extension_manager phpBB extension manager
* @param \Twig_LoaderInterface $loader Twig loader interface
* @param array $options Array of options to pass to Twig
* @param \phpbb\event\dispatcher_interface $phpbb_dispatcher Event dispatcher object
* @param array $options Array of options to pass to Twig
*/
public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array(), \phpbb\event\dispatcher_interface $phpbb_dispatcher = null)
public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, \phpbb\event\dispatcher_interface $phpbb_dispatcher = null, $options = array())
{
$this->phpbb_config = $phpbb_config;