Merge branch 'prep-release-3.3.6' into 3.3.x

phpBB/config/default/container/services.yml

@@ -116,7 +116,6 @@ services:
             - '@dbal.conn'
             - '@config'
             - '@filesystem'
-            - '@router'
             - '%tables.ext%'
             - '%core.root_path%'
             - '%core.php_ext%'

phpBB/phpbb/extension/manager.php

@@ -33,7 +33,6 @@ class manager
 	protected $extension_table;
 	protected $phpbb_root_path;
 	protected $cache_name;
-	protected $router;
 
 	/**
 	* Creates a manager and loads information from database
@@ -48,7 +47,7 @@ class manager
 	* @param \phpbb\cache\service $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\filesystem\filesystem_interface $filesystem, \phpbb\routing\router $router, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\service $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\filesystem\filesystem_interface $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', \phpbb\cache\service $cache = null, $cache_name = '_ext')
 	{
 		$this->cache = $cache;
 		$this->cache_name = $cache_name;
@@ -57,7 +56,6 @@ class manager
 		$this->db = $db;
 		$this->extension_table = $extension_table;
 		$this->filesystem = $filesystem;
-		$this->router = $router;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 
@@ -240,11 +238,6 @@ class manager
 			'ext_state'		=> serialize($state),
 		);
 
-		if ($active)
-		{
-			$this->router->without_cache();
-		}
-
 		$this->update_state($name, $extension_data, $this->is_configured($name) ? 'update' : 'insert');
 
 		if ($active)
@@ -294,11 +287,6 @@ class manager
 		$state = $extension->disable_step($old_state);
 		$active = ($state !== false);
 
-		if (!$active)
-		{
-			$this->router->without_cache();
-		}
-
 		$extension_data = array(
 			'ext_active'	=> $active,
 			'ext_state'		=> serialize($state),

phpBB/phpbb/routing/router.php

@@ -80,11 +80,6 @@ class router implements RouterInterface
 	 */
 	protected $cache_dir;
 
-	/**
-	 * @var bool
-	 */
-	protected $use_cache;
-
 	/**
 	 * Construct method
 	 *
@@ -102,7 +97,6 @@ class router implements RouterInterface
 		$this->php_ext				= $php_ext;
 		$this->context				= new RequestContext();
 		$this->cache_dir			= $cache_dir;
-		$this->use_cache			= true;
 	}
 
 	/**
@@ -182,22 +176,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.
 	 *
@@ -220,12 +198,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}", defined('DEBUG'));
@@ -281,12 +253,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}", defined('DEBUG'));