aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/config')
-rw-r--r--phpBB/config/default/config.yml0
-rw-r--r--phpBB/config/default/container/parameters.yml (renamed from phpBB/config/parameters.yml)0
-rw-r--r--phpBB/config/default/container/services.yml (renamed from phpBB/config/services.yml)71
-rw-r--r--phpBB/config/default/container/services_auth.yml (renamed from phpBB/config/auth.yml)0
-rw-r--r--phpBB/config/default/container/services_avatar.yml (renamed from phpBB/config/avatar.yml)4
-rw-r--r--phpBB/config/default/container/services_captcha.yml (renamed from phpBB/config/captcha.yml)0
-rw-r--r--phpBB/config/default/container/services_console.yml (renamed from phpBB/config/console.yml)1
-rw-r--r--phpBB/config/default/container/services_content.yml (renamed from phpBB/config/content.yml)0
-rw-r--r--phpBB/config/default/container/services_cron.yml (renamed from phpBB/config/cron.yml)0
-rw-r--r--phpBB/config/default/container/services_db.yml144
-rw-r--r--phpBB/config/default/container/services_event.yml (renamed from phpBB/config/event.yml)9
-rw-r--r--phpBB/config/default/container/services_feed.yml (renamed from phpBB/config/feed.yml)0
-rw-r--r--phpBB/config/default/container/services_help.yml10
-rw-r--r--phpBB/config/default/container/services_migrator.yml (renamed from phpBB/config/db.yml)18
-rw-r--r--phpBB/config/default/container/services_mimetype_guesser.yml (renamed from phpBB/config/mimetype_guesser.yml)0
-rw-r--r--phpBB/config/default/container/services_notification.yml (renamed from phpBB/config/notification.yml)0
-rw-r--r--phpBB/config/default/container/services_password.yml (renamed from phpBB/config/password.yml)0
-rw-r--r--phpBB/config/default/container/services_profilefield.yml (renamed from phpBB/config/profilefield.yml)0
-rw-r--r--phpBB/config/default/container/services_report.yml53
-rw-r--r--phpBB/config/default/container/services_text_formatter.yml61
-rw-r--r--phpBB/config/default/container/services_twig.yml48
-rw-r--r--phpBB/config/default/container/services_user.yml (renamed from phpBB/config/user.yml)0
-rw-r--r--phpBB/config/default/container/tables.yml (renamed from phpBB/config/tables.yml)4
-rw-r--r--phpBB/config/default/routing/help.yml3
-rw-r--r--phpBB/config/default/routing/report.yml17
-rw-r--r--phpBB/config/default/routing/routing.yml (renamed from phpBB/config/routing.yml)7
-rw-r--r--phpBB/config/development/config.yml8
-rw-r--r--phpBB/config/development/container/environment.yml3
-rw-r--r--phpBB/config/development/container/parameters.yml2
-rw-r--r--phpBB/config/development/container/services.yml2
-rw-r--r--phpBB/config/development/routing/environment.yml2
-rw-r--r--phpBB/config/production/config.yml2
-rw-r--r--phpBB/config/production/container/environment.yml3
-rw-r--r--phpBB/config/production/container/parameters.yml2
-rw-r--r--phpBB/config/production/container/services.yml2
-rw-r--r--phpBB/config/production/routing/environment.yml2
-rw-r--r--phpBB/config/test/config.yml5
-rw-r--r--phpBB/config/test/container/environment.yml3
-rw-r--r--phpBB/config/test/container/parameters.yml2
-rw-r--r--phpBB/config/test/container/services.yml2
-rw-r--r--phpBB/config/test/routing/environment.yml2
41 files changed, 443 insertions, 49 deletions
diff --git a/phpBB/config/default/config.yml b/phpBB/config/default/config.yml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/phpBB/config/default/config.yml
diff --git a/phpBB/config/parameters.yml b/phpBB/config/default/container/parameters.yml
index 8ecc1428f4..8ecc1428f4 100644
--- a/phpBB/config/parameters.yml
+++ b/phpBB/config/default/container/parameters.yml
diff --git a/phpBB/config/services.yml b/phpBB/config/default/container/services.yml
index 8667cbbf84..682eaeb200 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/default/container/services.yml
@@ -1,18 +1,22 @@
imports:
- - { resource: auth.yml }
- - { resource: avatar.yml }
- - { resource: captcha.yml }
- - { resource: console.yml }
- - { resource: content.yml }
- - { resource: cron.yml }
- - { resource: db.yml }
- - { resource: event.yml }
- - { resource: feed.yml }
- - { resource: mimetype_guesser.yml }
- - { resource: notification.yml }
- - { resource: password.yml }
- - { resource: profilefield.yml }
- - { resource: user.yml }
+ - { resource: services_auth.yml }
+ - { resource: services_avatar.yml }
+ - { resource: services_captcha.yml }
+ - { resource: services_console.yml }
+ - { resource: services_content.yml }
+ - { resource: services_cron.yml }
+ - { resource: services_db.yml }
+ - { resource: services_event.yml }
+ - { resource: services_feed.yml }
+ - { resource: services_help.yml }
+ - { resource: services_mimetype_guesser.yml }
+ - { resource: services_notification.yml }
+ - { resource: services_password.yml }
+ - { resource: services_profilefield.yml }
+ - { resource: services_report.yml }
+ - { resource: services_text_formatter.yml }
+ - { resource: services_twig.yml }
+ - { resource: services_user.yml }
- { resource: tables.yml }
- { resource: parameters.yml }
@@ -72,8 +76,7 @@ services:
- @template
- @user
- @config
- - @controller.provider
- - @ext.manager
+ - @router
- @symfony_request
- @request
- @filesystem
@@ -88,11 +91,6 @@ services:
- %core.root_path%
- @template
- controller.provider:
- class: phpbb\controller\provider
- calls:
- - [find, [%core.root_path%]]
-
ext.manager:
class: phpbb\extension\manager
arguments:
@@ -107,7 +105,7 @@ services:
- @cache.driver
filesystem:
- class: phpbb\filesystem
+ class: phpbb\filesystem\filesystem
file_downloader:
class: phpbb\file_downloader
@@ -117,6 +115,7 @@ services:
arguments:
- @dispatcher
- @controller.resolver
+ - @request_stack
log:
class: phpbb\log\log
@@ -159,6 +158,25 @@ 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:
@@ -166,6 +184,9 @@ services:
arguments:
- @request
+ request_stack:
+ class: Symfony\Component\HttpFoundation\RequestStack
+
template:
class: phpbb\template\twig\twig
arguments:
@@ -173,11 +194,17 @@ services:
- @config
- @user
- @template_context
+ - @template.twig.environment
+ - %core.template.cache_path%
+ - @template.twig.extensions.collection
- @ext.manager
template_context:
class: phpbb\template\context
+ upload_imagesize:
+ class: fastImageSize\fastImageSize
+
version_helper:
class: phpbb\version_helper
scope: prototype
diff --git a/phpBB/config/auth.yml b/phpBB/config/default/container/services_auth.yml
index 88a90ca2d6..88a90ca2d6 100644
--- a/phpBB/config/auth.yml
+++ b/phpBB/config/default/container/services_auth.yml
diff --git a/phpBB/config/avatar.yml b/phpBB/config/default/container/services_avatar.yml
index 5292489715..c74bef3d66 100644
--- a/phpBB/config/avatar.yml
+++ b/phpBB/config/default/container/services_avatar.yml
@@ -17,6 +17,7 @@ services:
class: phpbb\avatar\driver\gravatar
arguments:
- @config
+ - @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
@@ -30,6 +31,7 @@ services:
class: phpbb\avatar\driver\local
arguments:
- @config
+ - @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
@@ -43,6 +45,7 @@ services:
class: phpbb\avatar\driver\remote
arguments:
- @config
+ - @upload_imagesize
- %core.root_path%
- %core.php_ext%
- @path_helper
@@ -58,6 +61,7 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
+ - @filesystem
- @path_helper
- @mimetype.guesser
- @cache.driver
diff --git a/phpBB/config/captcha.yml b/phpBB/config/default/container/services_captcha.yml
index e3f617e909..e3f617e909 100644
--- a/phpBB/config/captcha.yml
+++ b/phpBB/config/default/container/services_captcha.yml
diff --git a/phpBB/config/console.yml b/phpBB/config/default/container/services_console.yml
index 1e18a7dd37..f0ae6c8ab4 100644
--- a/phpBB/config/console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -84,6 +84,7 @@ services:
- @config
- @cache
- @log
+ - @filesystem
- %core.root_path%
tags:
- { name: console.command }
diff --git a/phpBB/config/content.yml b/phpBB/config/default/container/services_content.yml
index 4d9ee31335..4d9ee31335 100644
--- a/phpBB/config/content.yml
+++ b/phpBB/config/default/container/services_content.yml
diff --git a/phpBB/config/cron.yml b/phpBB/config/default/container/services_cron.yml
index 7a90c39733..7a90c39733 100644
--- a/phpBB/config/cron.yml
+++ b/phpBB/config/default/container/services_cron.yml
diff --git a/phpBB/config/default/container/services_db.yml b/phpBB/config/default/container/services_db.yml
new file mode 100644
index 0000000000..ae2707b9a5
--- /dev/null
+++ b/phpBB/config/default/container/services_db.yml
@@ -0,0 +1,144 @@
+services:
+ dbal.conn:
+ class: phpbb\db\driver\factory
+ arguments:
+ - @service_container
+
+ dbal.conn.driver:
+ class: %dbal.driver.class%
+ calls:
+ - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
+
+# ----- DB Tools -----
+ dbal.tools.factory:
+ class: phpbb\db\tools\factory
+
+ dbal.tools:
+ class: phpbb\db\tools\tools_interface
+ factory: ["@dbal.tools.factory", get]
+ arguments:
+ - @dbal.conn.driver
+
+# ----- DB Extractor -----
+ dbal.extractor.factory:
+ class: phpbb\db\extractor\factory
+ arguments:
+ - @dbal.conn.driver
+ - @service_container
+
+ dbal.extractor:
+ class: phpbb\db\extractor\extractor_interface
+ factory: ["@dbal.extractor.factory", get]
+
+# ----- DB Extractors for different drivers -----
+# Scope MUST be prototype for all the handlers to work correctly.
+ dbal.extractor.extractors.mssql_extractor:
+ class: phpbb\db\extractor\mssql_extractor
+ scope: prototype
+ arguments:
+ - %core.root_path%
+ - @request
+ - @dbal.conn.driver
+
+ dbal.extractor.extractors.mysql_extractor:
+ class: phpbb\db\extractor\mysql_extractor
+ scope: prototype
+ arguments:
+ - %core.root_path%
+ - @request
+ - @dbal.conn.driver
+
+ dbal.extractor.extractors.oracle_extractor:
+ class: phpbb\db\extractor\oracle_extractor
+ scope: prototype
+ arguments:
+ - %core.root_path%
+ - @request
+ - @dbal.conn.driver
+
+ dbal.extractor.extractors.postgres_extractor:
+ class: phpbb\db\extractor\postgres_extractor
+ scope: prototype
+ arguments:
+ - %core.root_path%
+ - @request
+ - @dbal.conn.driver
+
+ dbal.extractor.extractors.sqlite3_extractor:
+ class: phpbb\db\extractor\sqlite3_extractor
+ scope: prototype
+ arguments:
+ - %core.root_path%
+ - @request
+ - @dbal.conn.driver
+
+ dbal.extractor.extractors.sqlite_extractor:
+ class: phpbb\db\extractor\sqlite_extractor
+ scope: prototype
+ arguments:
+ - %core.root_path%
+ - @request
+ - @dbal.conn.driver
+
+# ----- Migrator -----
+ migrator:
+ class: phpbb\db\migrator
+ arguments:
+ - @service_container
+ - @config
+ - @dbal.conn
+ - @dbal.tools
+ - %tables.migrations%
+ - %core.root_path%
+ - %core.php_ext%
+ - %core.table_prefix%
+ - @migrator.tool_collection
+ - @migrator.helper
+
+ migrator.helper:
+ class: phpbb\db\migration\helper
+
+# ----- Migrator's tools -----
+ migrator.tool_collection:
+ class: phpbb\di\service_collection
+ arguments:
+ - @service_container
+ tags:
+ - { name: service_collection, tag: migrator.tool }
+
+ migrator.tool.config:
+ class: phpbb\db\migration\tool\config
+ arguments:
+ - @config
+ tags:
+ - { name: migrator.tool }
+
+ migrator.tool.config_text:
+ class: phpbb\db\migration\tool\config_text
+ arguments:
+ - @config_text
+ tags:
+ - { name: migrator.tool }
+
+ migrator.tool.module:
+ class: phpbb\db\migration\tool\module
+ arguments:
+ - @dbal.conn
+ - @cache
+ - @user
+ - %core.root_path%
+ - %core.php_ext%
+ - %tables.modules%
+ tags:
+ - { name: migrator.tool }
+
+ migrator.tool.permission:
+ class: phpbb\db\migration\tool\permission
+ arguments:
+ - @dbal.conn
+ - @cache
+ - @auth
+ - %core.root_path%
+ - %core.php_ext%
+ tags:
+ - { name: migrator.tool }
diff --git a/phpBB/config/event.yml b/phpBB/config/default/container/services_event.yml
index 599b3cbb40..1ccef78f9b 100644
--- a/phpBB/config/event.yml
+++ b/phpBB/config/default/container/services_event.yml
@@ -11,15 +11,6 @@ services:
- %core.php_ext%
- @cache.driver
- kernel_request_subscriber:
- class: phpbb\event\kernel_request_subscriber
- arguments:
- - @ext.manager
- - %core.root_path%
- - %core.php_ext%
- tags:
- - { name: kernel.event_subscriber }
-
kernel_exception_subscriber:
class: phpbb\event\kernel_exception_subscriber
arguments:
diff --git a/phpBB/config/feed.yml b/phpBB/config/default/container/services_feed.yml
index 48bd9fe76f..48bd9fe76f 100644
--- a/phpBB/config/feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
diff --git a/phpBB/config/default/container/services_help.yml b/phpBB/config/default/container/services_help.yml
new file mode 100644
index 0000000000..ae3eafe7b0
--- /dev/null
+++ b/phpBB/config/default/container/services_help.yml
@@ -0,0 +1,10 @@
+services:
+ phpbb.help.controller:
+ class: phpbb\help\controller\help
+ arguments:
+ - @controller.helper
+ - @dispatcher
+ - @template
+ - @user
+ - %core.root_path%
+ - %core.php_ext%
diff --git a/phpBB/config/db.yml b/phpBB/config/default/container/services_migrator.yml
index d11669d8a3..cd04eea5c2 100644
--- a/phpBB/config/db.yml
+++ b/phpBB/config/default/container/services_migrator.yml
@@ -1,24 +1,7 @@
services:
- dbal.conn:
- class: phpbb\db\driver\factory
- arguments:
- - @service_container
-
- dbal.conn.driver:
- class: %dbal.driver.class%
- calls:
- - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
-
- dbal.tools:
- class: phpbb\db\tools
- arguments:
- - @dbal.conn
-
-# ----- Migrator -----
migrator:
class: phpbb\db\migrator
arguments:
- - @service_container
- @config
- @dbal.conn
- @dbal.tools
@@ -32,7 +15,6 @@ services:
migrator.helper:
class: phpbb\db\migration\helper
-# ----- Migrator's tools -----
migrator.tool_collection:
class: phpbb\di\service_collection
arguments:
diff --git a/phpBB/config/mimetype_guesser.yml b/phpBB/config/default/container/services_mimetype_guesser.yml
index 2e89ed3c1f..2e89ed3c1f 100644
--- a/phpBB/config/mimetype_guesser.yml
+++ b/phpBB/config/default/container/services_mimetype_guesser.yml
diff --git a/phpBB/config/notification.yml b/phpBB/config/default/container/services_notification.yml
index b17a172fb5..b17a172fb5 100644
--- a/phpBB/config/notification.yml
+++ b/phpBB/config/default/container/services_notification.yml
diff --git a/phpBB/config/password.yml b/phpBB/config/default/container/services_password.yml
index cb45ec3d42..cb45ec3d42 100644
--- a/phpBB/config/password.yml
+++ b/phpBB/config/default/container/services_password.yml
diff --git a/phpBB/config/profilefield.yml b/phpBB/config/default/container/services_profilefield.yml
index 5ccfef9148..5ccfef9148 100644
--- a/phpBB/config/profilefield.yml
+++ b/phpBB/config/default/container/services_profilefield.yml
diff --git a/phpBB/config/default/container/services_report.yml b/phpBB/config/default/container/services_report.yml
new file mode 100644
index 0000000000..4bf929429e
--- /dev/null
+++ b/phpBB/config/default/container/services_report.yml
@@ -0,0 +1,53 @@
+services:
+# ----- Report controller -----
+ phpbb.report.controller:
+ class: phpbb\report\controller\report
+ arguments:
+ - @config
+ - @user
+ - @template
+ - @controller.helper
+ - @request
+ - @captcha.factory
+ - @phpbb.report.handler_factory
+ - @phpbb.report.report_reason_list_provider
+ - %core.root_path%
+ - %core.php_ext%
+
+# ----- Report handler factory -----
+ phpbb.report.handler_factory:
+ class: phpbb\report\handler_factory
+ arguments:
+ - @service_container
+
+# ----- Report UI provider -----
+ phpbb.report.report_reason_list_provider:
+ class: phpbb\report\report_reason_list_provider
+ arguments:
+ - @dbal.conn.driver
+ - @template
+ - @user
+
+# ----- Report handlers -----
+# Scope MUST be prototype for all the handlers to work correctly.
+ phpbb.report.handlers.report_handler_pm:
+ class: phpbb\report\report_handler_pm
+ scope: prototype
+ arguments:
+ - @dbal.conn.driver
+ - @dispatcher
+ - @config
+ - @auth
+ - @user
+ - @notification_manager
+
+ phpbb.report.handlers.report_handler_post:
+ class: phpbb\report\report_handler_post
+ scope: prototype
+ arguments:
+ - @dbal.conn.driver
+ - @dispatcher
+ - @config
+ - @auth
+ - @user
+ - @notification_manager
diff --git a/phpBB/config/default/container/services_text_formatter.yml b/phpBB/config/default/container/services_text_formatter.yml
new file mode 100644
index 0000000000..972be31b31
--- /dev/null
+++ b/phpBB/config/default/container/services_text_formatter.yml
@@ -0,0 +1,61 @@
+parameters:
+ text_formatter.cache.dir: %core.root_path%cache/%core.environment%/
+ text_formatter.cache.parser.key: _text_formatter_parser
+ text_formatter.cache.renderer.key: _text_formatter_renderer
+
+services:
+ text_formatter.cache:
+ alias: text_formatter.s9e.factory
+
+ text_formatter.data_access:
+ class: phpbb\textformatter\data_access
+ arguments:
+ - @dbal.conn
+ - %tables.bbcodes%
+ - %tables.smilies%
+ - %tables.styles%
+ - %tables.words%
+ - %core.root_path%styles/
+
+ text_formatter.parser:
+ alias: text_formatter.s9e.parser
+
+ text_formatter.renderer:
+ alias: text_formatter.s9e.renderer
+
+ text_formatter.utils:
+ alias: text_formatter.s9e.utils
+
+ text_formatter.s9e.factory:
+ class: phpbb\textformatter\s9e\factory
+ arguments:
+ - @text_formatter.data_access
+ - @cache.driver
+ - @dispatcher
+ - %text_formatter.cache.dir%
+ - %text_formatter.cache.parser.key%
+ - %text_formatter.cache.renderer.key%
+
+ text_formatter.s9e.parser:
+ class: phpbb\textformatter\s9e\parser
+ arguments:
+ - @cache.driver
+ - %text_formatter.cache.parser.key%
+ - @user
+ - @text_formatter.s9e.factory
+ - @dispatcher
+
+ text_formatter.s9e.renderer:
+ class: phpbb\textformatter\s9e\renderer
+ arguments:
+ - @cache.driver
+ - %text_formatter.cache.dir%
+ - %text_formatter.cache.renderer.key%
+ - @text_formatter.s9e.factory
+ - @dispatcher
+ calls:
+ - [configure_smilies_path, [@config, @path_helper]]
+ - [configure_user, [@user, @config, @auth]]
+
+ text_formatter.s9e.utils:
+ class: phpbb\textformatter\s9e\utils
diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml
new file mode 100644
index 0000000000..5d7bf0eff3
--- /dev/null
+++ b/phpBB/config/default/container/services_twig.yml
@@ -0,0 +1,48 @@
+parameters:
+ core.template.cache_path: %core.root_path%cache/%core.environment%/twig/
+
+services:
+ template.twig.environment:
+ class: phpbb\template\twig\environment
+ arguments:
+ - @config
+ - @path_helper
+ - @service_container
+ - %core.template.cache_path%
+ - @ext.manager
+ - @template.twig.loader
+
+ template.twig.lexer:
+ class: phpbb\template\twig\lexer
+ arguments:
+ - @template.twig.environment
+
+ template.twig.loader:
+ class: phpbb\template\twig\loader
+ arguments:
+ - @filesystem
+
+ template.twig.extensions.collection:
+ class: phpbb\di\service_collection
+ arguments:
+ - @service_container
+ tags:
+ - { name: service_collection, tag: twig.extension }
+
+ template.twig.extensions.phpbb:
+ class: phpbb\template\twig\extension
+ arguments:
+ - @template_context
+ - @user
+ tags:
+ - { name: twig.extension }
+
+ template.twig.extensions.routing:
+ class: Symfony\Bridge\Twig\Extension\RoutingExtension
+ arguments:
+ - @router
+ tags:
+ - { name: twig.extension }
+
+ template.twig.extensions.debug:
+ class: Twig_Extension_Debug
diff --git a/phpBB/config/user.yml b/phpBB/config/default/container/services_user.yml
index 1ca853ea45..1ca853ea45 100644
--- a/phpBB/config/user.yml
+++ b/phpBB/config/default/container/services_user.yml
diff --git a/phpBB/config/tables.yml b/phpBB/config/default/container/tables.yml
index 2fe2a33be8..00067d5abe 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/default/container/tables.yml
@@ -1,6 +1,7 @@
parameters:
tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens
tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts
+ tables.bbcodes: %core.table_prefix%bbcodes
tables.captcha_qa_questions: %core.table_prefix%captcha_questions
tables.captcha_qa_answers: %core.table_prefix%captcha_answers
tables.captcha_qa_confirm: %core.table_prefix%qa_confirm
@@ -18,6 +19,9 @@ parameters:
tables.profile_fields_options_language: %core.table_prefix%profile_fields_lang
tables.profile_fields_language: %core.table_prefix%profile_lang
tables.posts: %core.table_prefix%posts
+ tables.smilies: %core.table_prefix%smilies
+ tables.styles: %core.table_prefix%styles
tables.topics: %core.table_prefix%topics
tables.user_notifications: %core.table_prefix%user_notifications
tables.users: %core.table_prefix%users
+ tables.words: %core.table_prefix%words
diff --git a/phpBB/config/default/routing/help.yml b/phpBB/config/default/routing/help.yml
new file mode 100644
index 0000000000..957d6dab55
--- /dev/null
+++ b/phpBB/config/default/routing/help.yml
@@ -0,0 +1,3 @@
+phpbb_help_controller:
+ path: /{mode}
+ defaults: { _controller: phpbb.help.controller:handle }
diff --git a/phpBB/config/default/routing/report.yml b/phpBB/config/default/routing/report.yml
new file mode 100644
index 0000000000..dbe2d853c0
--- /dev/null
+++ b/phpBB/config/default/routing/report.yml
@@ -0,0 +1,17 @@
+phpbb_report_pm_controller:
+ path: /pm/{id}/report
+ methods: [GET, POST]
+ defaults:
+ _controller: phpbb.report.controller:handle
+ mode: "pm"
+ requirements:
+ id: \d+
+
+phpbb_report_post_controller:
+ path: /post/{id}/report
+ methods: [GET, POST]
+ defaults:
+ _controller: phpbb.report.controller:handle
+ mode: "post"
+ requirements:
+ id: \d+
diff --git a/phpBB/config/routing.yml b/phpBB/config/default/routing/routing.yml
index 94146e1ec2..b7e7a69b4f 100644
--- a/phpBB/config/routing.yml
+++ b/phpBB/config/default/routing/routing.yml
@@ -7,3 +7,10 @@
# The above will be accessed via app.php?controller=foo and it will
# instantiate the "foo_service" service and call the "method" method.
#
+
+phpbb_help_routing:
+ resource: "help.yml"
+ prefix: /help
+
+phpbb_report_routing:
+ resource: "report.yml"
diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml
new file mode 100644
index 0000000000..f451eebe13
--- /dev/null
+++ b/phpBB/config/development/config.yml
@@ -0,0 +1,8 @@
+imports:
+ - { resource: ../default/config.yml }
+
+core:
+ require_dev_dependencies: true
+
+ twig:
+ enable_debug_extension: true
diff --git a/phpBB/config/development/container/environment.yml b/phpBB/config/development/container/environment.yml
new file mode 100644
index 0000000000..40a3c7a683
--- /dev/null
+++ b/phpBB/config/development/container/environment.yml
@@ -0,0 +1,3 @@
+imports:
+ - { resource: services.yml }
+ - { resource: parameters.yml }
diff --git a/phpBB/config/development/container/parameters.yml b/phpBB/config/development/container/parameters.yml
new file mode 100644
index 0000000000..0447646806
--- /dev/null
+++ b/phpBB/config/development/container/parameters.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/parameters.yml }
diff --git a/phpBB/config/development/container/services.yml b/phpBB/config/development/container/services.yml
new file mode 100644
index 0000000000..b302f0f966
--- /dev/null
+++ b/phpBB/config/development/container/services.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/services.yml }
diff --git a/phpBB/config/development/routing/environment.yml b/phpBB/config/development/routing/environment.yml
new file mode 100644
index 0000000000..0cddfb7521
--- /dev/null
+++ b/phpBB/config/development/routing/environment.yml
@@ -0,0 +1,2 @@
+core.default:
+ resource: "../../default/routing/routing.yml"
diff --git a/phpBB/config/production/config.yml b/phpBB/config/production/config.yml
new file mode 100644
index 0000000000..979dbbcdd9
--- /dev/null
+++ b/phpBB/config/production/config.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../default/config.yml }
diff --git a/phpBB/config/production/container/environment.yml b/phpBB/config/production/container/environment.yml
new file mode 100644
index 0000000000..40a3c7a683
--- /dev/null
+++ b/phpBB/config/production/container/environment.yml
@@ -0,0 +1,3 @@
+imports:
+ - { resource: services.yml }
+ - { resource: parameters.yml }
diff --git a/phpBB/config/production/container/parameters.yml b/phpBB/config/production/container/parameters.yml
new file mode 100644
index 0000000000..0447646806
--- /dev/null
+++ b/phpBB/config/production/container/parameters.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/parameters.yml }
diff --git a/phpBB/config/production/container/services.yml b/phpBB/config/production/container/services.yml
new file mode 100644
index 0000000000..b302f0f966
--- /dev/null
+++ b/phpBB/config/production/container/services.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/services.yml }
diff --git a/phpBB/config/production/routing/environment.yml b/phpBB/config/production/routing/environment.yml
new file mode 100644
index 0000000000..0cddfb7521
--- /dev/null
+++ b/phpBB/config/production/routing/environment.yml
@@ -0,0 +1,2 @@
+core.default:
+ resource: "../../default/routing/routing.yml"
diff --git a/phpBB/config/test/config.yml b/phpBB/config/test/config.yml
new file mode 100644
index 0000000000..1c17b08931
--- /dev/null
+++ b/phpBB/config/test/config.yml
@@ -0,0 +1,5 @@
+imports:
+ - { resource: ../default/config.yml }
+
+core:
+ require_dev_dependencies: true
diff --git a/phpBB/config/test/container/environment.yml b/phpBB/config/test/container/environment.yml
new file mode 100644
index 0000000000..40a3c7a683
--- /dev/null
+++ b/phpBB/config/test/container/environment.yml
@@ -0,0 +1,3 @@
+imports:
+ - { resource: services.yml }
+ - { resource: parameters.yml }
diff --git a/phpBB/config/test/container/parameters.yml b/phpBB/config/test/container/parameters.yml
new file mode 100644
index 0000000000..0447646806
--- /dev/null
+++ b/phpBB/config/test/container/parameters.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/parameters.yml }
diff --git a/phpBB/config/test/container/services.yml b/phpBB/config/test/container/services.yml
new file mode 100644
index 0000000000..b302f0f966
--- /dev/null
+++ b/phpBB/config/test/container/services.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/services.yml }
diff --git a/phpBB/config/test/routing/environment.yml b/phpBB/config/test/routing/environment.yml
new file mode 100644
index 0000000000..0cddfb7521
--- /dev/null
+++ b/phpBB/config/test/routing/environment.yml
@@ -0,0 +1,2 @@
+core.default:
+ resource: "../../default/routing/routing.yml"