From 07b2046685381813eb3bdf2a68ea36c8848af5be Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Thu, 27 Feb 2020 16:51:06 +0100
Subject: [PATCH] [ticket/16382] Update Twig_Loader
PHPBB3-16382
---
phpBB/phpbb/template/twig/environment.php | 4 ++--
phpBB/phpbb/template/twig/loader.php | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index ac4b16e457..0b038ac612 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/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;
diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php
index 0f193dbe59..66e95b3d2a 100644
--- a/phpBB/phpbb/template/twig/loader.php
+++ b/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)
{