mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 19:24:01 +02:00
[ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
This commit is contained in:
@@ -21,17 +21,17 @@ class asset
|
||||
{
|
||||
protected $components = array();
|
||||
|
||||
/** @var \phpbb\filesystem **/
|
||||
protected $phpbb_filesystem;
|
||||
/** @var \phpbb\path_helper **/
|
||||
protected $path_helper;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param string $url URL
|
||||
*/
|
||||
public function __construct($url, \phpbb\filesystem $phpbb_filesystem)
|
||||
public function __construct($url, \phpbb\path_helper $path_helper)
|
||||
{
|
||||
$this->phpbb_filesystem = $phpbb_filesystem;
|
||||
$this->path_helper = $path_helper;
|
||||
|
||||
$this->set_url($url);
|
||||
}
|
||||
@@ -119,7 +119,7 @@ class asset
|
||||
*/
|
||||
public function get_url()
|
||||
{
|
||||
return $this->phpbb_filesystem->update_web_root_path($this->join_url($this->components));
|
||||
return $this->path_helper->update_web_root_path($this->join_url($this->components));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -35,7 +35,7 @@ abstract class includeasset extends \Twig_Node
|
||||
->write("\$asset_file = ")
|
||||
->subcompile($this->getNode('expr'))
|
||||
->raw(";\n")
|
||||
->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\n")
|
||||
->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_path_helper());\n")
|
||||
->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
|
||||
->indent()
|
||||
->write("\$asset_path = \$asset->get_path();")
|
||||
|
@@ -33,10 +33,10 @@ class twig extends \phpbb\template\base
|
||||
private $cachepath = '';
|
||||
|
||||
/**
|
||||
* phpBB filesystem
|
||||
* @var \phpbb\filesystem
|
||||
* phpBB path helper
|
||||
* @var \phpbb\path_helper
|
||||
*/
|
||||
protected $phpbb_filesystem;
|
||||
protected $path_helper;
|
||||
|
||||
/**
|
||||
* phpBB root path
|
||||
@@ -79,17 +79,17 @@ class twig extends \phpbb\template\base
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param \phpbb\filesystem $phpbb_filesystem
|
||||
* @param \phpbb\path_helper $path_helper
|
||||
* @param \phpbb\config\config $config
|
||||
* @param \phpbb\user $user
|
||||
* @param \phpbb\template\context $context template context
|
||||
* @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked
|
||||
*/
|
||||
public function __construct(\phpbb\filesystem $phpbb_filesystem, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null)
|
||||
public function __construct(\phpbb\path_helper $path_helper, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null)
|
||||
{
|
||||
$this->phpbb_filesystem = $phpbb_filesystem;
|
||||
$this->phpbb_root_path = $phpbb_filesystem->get_phpbb_root_path();
|
||||
$this->php_ext = $phpbb_filesystem->get_php_ext();
|
||||
$this->path_helper = $path_helper;
|
||||
$this->phpbb_root_path = $path_helper->get_phpbb_root_path();
|
||||
$this->php_ext = $path_helper->get_php_ext();
|
||||
$this->config = $config;
|
||||
$this->user = $user;
|
||||
$this->context = $context;
|
||||
@@ -103,7 +103,7 @@ class twig extends \phpbb\template\base
|
||||
$this->twig = new \phpbb\template\twig\environment(
|
||||
$this->config,
|
||||
($this->extension_manager) ? $this->extension_manager->all_enabled() : array(),
|
||||
$this->phpbb_filesystem,
|
||||
$this->path_helper,
|
||||
$loader,
|
||||
array(
|
||||
'cache' => (defined('IN_INSTALL')) ? false : $this->cachepath,
|
||||
@@ -125,9 +125,9 @@ class twig extends \phpbb\template\base
|
||||
$this->twig->setLexer($lexer);
|
||||
|
||||
// Add admin namespace
|
||||
if ($this->phpbb_filesystem->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->phpbb_filesystem->get_adm_relative_path() . 'style/'))
|
||||
if ($this->path_helper->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/'))
|
||||
{
|
||||
$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->phpbb_filesystem->get_adm_relative_path() . 'style/', 'admin');
|
||||
$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/', 'admin');
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user