diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-14 16:47:18 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-14 16:47:18 +0200 |
| commit | a26ab86dc63b196c79d86f3da36b8596a7beeb02 (patch) | |
| tree | be417ba6874bc300c9bf6ad393dcbf4b9789b836 /phpBB/config/default | |
| parent | 11167f606015bc4663fa5a122ca95436ff412afc (diff) | |
| parent | 74dbaac0394f45955553ff46515404fe5b06bfba (diff) | |
| download | forums-a26ab86dc63b196c79d86f3da36b8596a7beeb02.tar forums-a26ab86dc63b196c79d86f3da36b8596a7beeb02.tar.gz forums-a26ab86dc63b196c79d86f3da36b8596a7beeb02.tar.bz2 forums-a26ab86dc63b196c79d86f3da36b8596a7beeb02.tar.xz forums-a26ab86dc63b196c79d86f3da36b8596a7beeb02.zip | |
Merge pull request #3577 from MateBartus/ticket/13800
[ticket/13800] Make router's extension manager dependency optional
Diffstat (limited to 'phpBB/config/default')
| -rw-r--r-- | phpBB/config/default/container/services.yml | 20 | ||||
| -rw-r--r-- | phpBB/config/default/container/services_routing.yml | 19 |
2 files changed, 20 insertions, 19 deletions
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index 670ea3bd61..95d624a8ae 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -15,6 +15,7 @@ imports: - { resource: services_password.yml } - { resource: services_profilefield.yml } - { resource: services_report.yml } + - { resource: services_routing.yml } - { resource: services_text_formatter.yml } - { resource: services_twig.yml } - { resource: services_user.yml } @@ -157,25 +158,6 @@ services: - null - %core.disable_super_globals% - router: - class: phpbb\routing\router - arguments: - - @filesystem - - @ext.manager - - %core.root_path% - - %core.php_ext% - - %core.environment% - - router.listener: - class: Symfony\Component\HttpKernel\EventListener\RouterListener - arguments: - - @router - - null - - null - - @request_stack - tags: - - { name: kernel.event_subscriber } - # WARNING: The Symfony request does not escape the input and should be used very carefully # prefer the phpbb request (service @request) as possible symfony_request: diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml new file mode 100644 index 0000000000..6749202c0d --- /dev/null +++ b/phpBB/config/default/container/services_routing.yml @@ -0,0 +1,19 @@ +services: + router: + class: phpbb\routing\router + arguments: + - @filesystem + - %core.root_path% + - %core.php_ext% + - %core.environment% + - @ext.manager + + router.listener: + class: Symfony\Component\HttpKernel\EventListener\RouterListener + arguments: + - @router + - null + - null + - @request_stack + tags: + - { name: kernel.event_subscriber } |