mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-11 03:12:21 +02:00
Code Issues Releases Wiki Activity

[ticket/16382] Update Twig_Loader

Browse Source 
PHPBB3-16382
This commit is contained in:
mrgoldy 2020-02-27 16:51:06 +01:00
parent 90c15aeebc
commit 07b2046685
2 changed files with 5 additions and 5 deletions
phpBB/phpbb/template/twig
environment.phploader.php

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

@ -55,11 +55,11 @@ class environment extends \Twig_Environment
* @param \phpbb\path_helper $path_helper phpBB path helper
* @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 \Twig\Loader\LoaderInterface $loader Twig loader interface
* @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, \phpbb\event\dispatcher_interface $phpbb_dispatcher = null, $options = array())
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\Loader\LoaderInterface $loader = null, \phpbb\event\dispatcher_interface $phpbb_dispatcher = null, $options = array())
{
$this->phpbb_config = $phpbb_config;

6
phpBB/phpbb/template/twig/loader.php

@ -16,7 +16,7 @@ namespace phpbb\template\twig;
/**
* Twig Template loader
*/
class loader extends \Twig_Loader_Filesystem
class loader extends \Twig\Loader\FilesystemLoader
{
protected $safe_directories = array();
@ -42,7 +42,7 @@ class loader extends \Twig_Loader_Filesystem
* Set safe directories
*
* @param array $directories Array of directories that are safe (empty to clear)
* @return \Twig_Loader_Filesystem
* @return \Twig\Loader\FilesystemLoader
*/
public function setSafeDirectories($directories = array())
{
@ -63,7 +63,7 @@ class loader extends \Twig_Loader_Filesystem
* Add safe directory
*
* @param string $directory Directory that should be added
* @return \Twig_Loader_Filesystem
* @return \Twig\Loader\FilesystemLoader
*/
public function addSafeDirectory($directory)
{