diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-09-26 15:34:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-09-26 15:34:44 +0200 |
| commit | 7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e (patch) | |
| tree | 9a7cf0bb2f985be79c51d4d0a1743a90b5532404 /phpBB/phpbb/template/twig/environment.php | |
| parent | e8303bc3199081d1f9f0679d3b98298ccdc49deb (diff) | |
| download | forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar.gz forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar.bz2 forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.tar.xz forums-7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e.zip | |
[ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
Diffstat (limited to 'phpBB/phpbb/template/twig/environment.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index e0ee23dcd9..a6c0e476f0 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -25,8 +25,8 @@ class environment extends \Twig_Environment /** @var \phpbb\config\config */ protected $phpbb_config; - /** @var \phpbb\filesystem */ - protected $phpbb_filesystem; + /** @var \phpbb\path_helper */ + protected $phpbb_path_helper; /** @var string */ protected $phpbb_root_path; @@ -42,19 +42,19 @@ class environment extends \Twig_Environment * * @param \phpbb\config\config $phpbb_config * @param array $phpbb_extensions Array of enabled extensions (name => path) - * @param \phpbb\filesystem + * @param \phpbb\path_helper * @param string $phpbb_root_path * @param Twig_LoaderInterface $loader * @param array $options Array of options to pass to Twig */ - public function __construct($phpbb_config, $phpbb_extensions, \phpbb\filesystem $phpbb_filesystem, \Twig_LoaderInterface $loader = null, $options = array()) + public function __construct($phpbb_config, $phpbb_extensions, \phpbb\path_helper $path_helper, \Twig_LoaderInterface $loader = null, $options = array()) { $this->phpbb_config = $phpbb_config; $this->phpbb_extensions = $phpbb_extensions; - $this->phpbb_filesystem = $phpbb_filesystem; - $this->phpbb_root_path = $this->phpbb_filesystem->get_phpbb_root_path(); - $this->web_root_path = $this->phpbb_filesystem->get_web_root_path(); + $this->phpbb_path_helper = $path_helper; + $this->phpbb_root_path = $this->phpbb_path_helper->get_phpbb_root_path(); + $this->web_root_path = $this->phpbb_path_helper->get_web_root_path(); return parent::__construct($loader, $options); } @@ -102,13 +102,13 @@ class environment extends \Twig_Environment } /** - * Get the phpbb_filesystem object + * Get the phpbb path helper object * - * @return \phpbb\filesystem + * @return \phpbb\path_helper */ - public function get_filesystem() + public function get_path_helper() { - return $this->phpbb_filesystem; + return $this->phpbb_path_helper; } /** |