1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2022-01-31 20:55:15 +01:00
8 changed files with 1 additions and 54 deletions

View File

@@ -92,11 +92,6 @@ class router implements RouterInterface
*/
protected $debug_url_matcher;
/**
* @var bool
*/
protected $use_cache;
/**
* Construct method
*
@@ -118,7 +113,6 @@ class router implements RouterInterface
$this->cache_dir = $cache_dir;
$this->debug_url_generator = $debug_url_generator;
$this->debug_url_matcher = $debug_url_matcher;
$this->use_cache = true;
}
/**
@@ -198,22 +192,6 @@ class router implements RouterInterface
return $this->get_matcher()->match($pathinfo);
}
/**
* Enables the use of a cached URL generator and matcher
*/
public function with_cache()
{
$this->use_cache = true;
}
/**
* Disables the use of a cached URL generator and matcher
*/
public function without_cache()
{
$this->use_cache = false;
}
/**
* Gets the UrlMatcher instance associated with this Router.
*
@@ -236,12 +214,6 @@ class router implements RouterInterface
*/
protected function create_dumped_url_matcher()
{
if (!$this->use_cache)
{
$this->create_new_url_matcher();
return;
}
try
{
$cache = new ConfigCache("{$this->cache_dir}url_matcher.{$this->php_ext}", $this->debug_url_matcher);
@@ -290,12 +262,6 @@ class router implements RouterInterface
*/
protected function create_dumped_url_generator()
{
if (!$this->use_cache)
{
$this->create_new_url_generator();
return;
}
try
{
$cache = new ConfigCache("{$this->cache_dir}url_generator.{$this->php_ext}", $this->debug_url_generator);