diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-04 23:50:16 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-05 17:07:11 +0200 |
| commit | 51376a43919cba7a5037edb7cc31f18b5950437b (patch) | |
| tree | 346e51469449521e40a25d875bcc3f7b8d7846f7 /phpBB/phpbb/template/twig/environment.php | |
| parent | 321ed2a3dd10231a09dec18a85a783a73ba12ddf (diff) | |
| download | forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar.gz forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar.bz2 forums-51376a43919cba7a5037edb7cc31f18b5950437b.tar.xz forums-51376a43919cba7a5037edb7cc31f18b5950437b.zip | |
[ticket/13638] Inject $filesystem in \phpbb\template\asset
PHPBB3-13638
Diffstat (limited to 'phpBB/phpbb/template/twig/environment.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index 0ba7a265e4..e7b8aeab89 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -18,6 +18,9 @@ class environment extends \Twig_Environment /** @var \phpbb\config\config */ protected $phpbb_config; + /** @var \phpbb\filesystem\filesystem */ + protected $filesystem; + /** @var \phpbb\path_helper */ protected $phpbb_path_helper; @@ -40,6 +43,7 @@ class environment extends \Twig_Environment * Constructor * * @param \phpbb\config\config $phpbb_config The phpBB configuration + * @param \phpbb\filesystem\filesystem $filesystem * @param \phpbb\path_helper $path_helper phpBB path helper * @param \Symfony\Component\DependencyInjection\ContainerInterface $container The dependency injection container * @param string $cache_path The path to the cache directory @@ -47,10 +51,11 @@ class environment extends \Twig_Environment * @param \Twig_LoaderInterface $loader Twig loader interface * @param array $options Array of options to pass to Twig */ - public function __construct($phpbb_config, \phpbb\path_helper $path_helper, \Symfony\Component\DependencyInjection\ContainerInterface $container, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array()) + public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, \Symfony\Component\DependencyInjection\ContainerInterface $container, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array()) { $this->phpbb_config = $phpbb_config; + $this->filesystem = $filesystem; $this->phpbb_path_helper = $path_helper; $this->extension_manager = $extension_manager; $this->container = $container; @@ -106,16 +111,26 @@ class environment extends \Twig_Environment } /** - * Get the phpBB root path - * - * @return string - */ + * Get the phpBB root path + * + * @return string + */ public function get_phpbb_root_path() { return $this->phpbb_root_path; } /** + * Get the filesystem object + * + * @return \phpbb\filesystem\filesystem + */ + public function get_filesystem() + { + return $this->filesystem; + } + + /** * Get the web root path * * @return string |