mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-19 07:00:14 +01:00
Merge pull request #5334 from rubencm/ticket/12630
[ticket/12630] Add debug.url_matcher
This commit is contained in:
commit
10dbc2878c
@ -8,6 +8,7 @@ services:
|
||||
- '%core.php_ext%'
|
||||
- '%core.cache_dir%'
|
||||
- '%debug.url_generator%'
|
||||
- '%debug.url_matcher%'
|
||||
|
||||
router.listener:
|
||||
class: Symfony\Component\HttpKernel\EventListener\RouterListener
|
||||
|
@ -12,6 +12,7 @@ core:
|
||||
memory: true
|
||||
show_errors: true
|
||||
url_generator: true
|
||||
url_matcher: true
|
||||
|
||||
twig:
|
||||
debug: true
|
||||
|
@ -41,6 +41,7 @@ class container_configuration implements ConfigurationInterface
|
||||
->booleanNode('memory')->defaultValue(false)->end()
|
||||
->booleanNode('show_errors')->defaultValue(false)->end()
|
||||
->booleanNode('url_generator')->defaultValue(false)->end()
|
||||
->booleanNode('url_matcher')->defaultValue(false)->end()
|
||||
->end()
|
||||
->end()
|
||||
->arrayNode('twig')
|
||||
|
@ -85,17 +85,23 @@ class router implements RouterInterface
|
||||
*/
|
||||
protected $debug_url_generator;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $debug_url_matcher;
|
||||
|
||||
/**
|
||||
* Construct method
|
||||
*
|
||||
* @param ContainerInterface $container DI container
|
||||
* @param resources_locator_interface $resources_locator Resources locator
|
||||
* @param LoaderInterface $loader Resources loader
|
||||
* @param string $php_ext PHP file extension
|
||||
* @param string $cache_dir phpBB cache directory
|
||||
* @param string $debug_url_generator Debug url generator
|
||||
* @param ContainerInterface $container DI container
|
||||
* @param resources_locator_interface $resources_locator Resources locator
|
||||
* @param LoaderInterface $loader Resources loader
|
||||
* @param string $php_ext PHP file extension
|
||||
* @param string $cache_dir phpBB cache directory
|
||||
* @param string $debug_url_generator Debug url generator
|
||||
* @param string $debug_url_matcher Debug url matcher
|
||||
*/
|
||||
public function __construct(ContainerInterface $container, resources_locator_interface $resources_locator, LoaderInterface $loader, $php_ext, $cache_dir, $debug_url_generator)
|
||||
public function __construct(ContainerInterface $container, resources_locator_interface $resources_locator, LoaderInterface $loader, string $php_ext, string $cache_dir, string $debug_url_generator, string $debug_url_matcher)
|
||||
{
|
||||
$this->container = $container;
|
||||
$this->resources_locator = $resources_locator;
|
||||
@ -104,6 +110,7 @@ class router implements RouterInterface
|
||||
$this->context = new RequestContext();
|
||||
$this->cache_dir = $cache_dir;
|
||||
$this->debug_url_generator = $debug_url_generator;
|
||||
$this->debug_url_matcher = $debug_url_matcher;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -207,7 +214,7 @@ class router implements RouterInterface
|
||||
{
|
||||
try
|
||||
{
|
||||
$cache = new ConfigCache("{$this->cache_dir}url_matcher.{$this->php_ext}", defined('DEBUG'));
|
||||
$cache = new ConfigCache("{$this->cache_dir}url_matcher.{$this->php_ext}", $this->debug_url_matcher);
|
||||
if (!$cache->isFresh())
|
||||
{
|
||||
$dumper = new PhpMatcherDumper($this->get_routes());
|
||||
|
@ -151,7 +151,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
|
||||
new \phpbb\routing\file_locator(dirname(__FILE__) . '/')
|
||||
);
|
||||
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
|
||||
$this->router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', dirname(__FILE__) . '/', true);
|
||||
$this->router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', dirname(__FILE__) . '/', true, true);
|
||||
$this->auth = new \phpbb\auth\auth();
|
||||
$this->cache = new \phpbb\cache\driver\dummy();
|
||||
$this->db = $this->new_dbal();
|
||||
|
@ -48,7 +48,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
|
||||
new \phpbb\routing\file_locator(dirname(__FILE__) . '/')
|
||||
);
|
||||
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
|
||||
$router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', dirname(__FILE__) . '/', true);
|
||||
$router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', dirname(__FILE__) . '/', true, true);
|
||||
$routes = $router->get_routes();
|
||||
|
||||
// This will need to be updated if any new routes are defined
|
||||
|
@ -42,7 +42,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
|
||||
new \phpbb\routing\file_locator(dirname(__FILE__) . '/')
|
||||
);
|
||||
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $manager);
|
||||
$router = new phpbb_mock_router(new phpbb_mock_container_builder(), $resources_locator, $loader, 'php', dirname(__FILE__) . '/', true);
|
||||
$router = new phpbb_mock_router(new phpbb_mock_container_builder(), $resources_locator, $loader, 'php', dirname(__FILE__) . '/', true, true);
|
||||
|
||||
$request = new phpbb_mock_request();
|
||||
$request->overwrite('SCRIPT_NAME', '/app.php', \phpbb\request\request_interface::SERVER);
|
||||
|
Loading…
x
Reference in New Issue
Block a user