3 files changed, 86 insertions, 1 deletions
diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index 6f6e129b29..169bf82098 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -187,8 +187,9 @@ services:
         class: phpbb\console\command\reparser\reparse
         arguments:
             - @user
+            - @text_reparser.lock
             - @text_reparser_collection
-            - @config_text
+            - @text_reparser.manager
         tags:
             - { name: console.command }
 
diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml
index c5b88df181..4b76bdaf6a 100644
--- a/phpBB/config/default/container/services_cron.yml
+++ b/phpBB/config/default/container/services_cron.yml
@@ -146,3 +146,73 @@ services:
             - [set_name, [cron.task.core.tidy_warnings]]
         tags:
             - { name: cron.task }
+
+    cron.task.text_reparser.pm_text:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - @config
+            - @config_text
+            - @text_reparser.lock
+            - @text_reparser.manager
+            - @text_reparser_collection
+        calls:
+            - [set_name, [cron.task.text_reparser.pm_text]]
+            - [set_reparser, [text_reparser.pm_text]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.poll_option:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - @config
+            - @config_text
+            - @text_reparser.lock
+            - @text_reparser.manager
+            - @text_reparser_collection
+        calls:
+            - [set_name, [cron.task.text_reparser.poll_option]]
+            - [set_reparser, [text_reparser.poll_option]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.poll_title:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - @config
+            - @config_text
+            - @text_reparser.lock
+            - @text_reparser.manager
+            - @text_reparser_collection
+        calls:
+            - [set_name, [cron.task.text_reparser.poll_title]]
+            - [set_reparser, [text_reparser.poll_title]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.post_text:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - @config
+            - @config_text
+            - @text_reparser.lock
+            - @text_reparser.manager
+            - @text_reparser_collection
+        calls:
+            - [set_name, [cron.task.text_reparser.post_text]]
+            - [set_reparser, [text_reparser.post_text]]
+        tags:
+            - { name: cron.task }
+
+    cron.task.text_reparser.user_signature:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - @config
+            - @config_text
+            - @text_reparser.lock
+            - @text_reparser.manager
+            - @text_reparser_collection
+        calls:
+            - [set_name, [cron.task.text_reparser.user_signature]]
+            - [set_reparser, [text_reparser.user_signature]]
+        tags:
+            - { name: cron.task }
diff --git a/phpBB/config/default/container/services_text_reparser.yml b/phpBB/config/default/container/services_text_reparser.yml
index dd15b9f09a..3c3707e7cf 100644
--- a/phpBB/config/default/container/services_text_reparser.yml
+++ b/phpBB/config/default/container/services_text_reparser.yml
@@ -1,4 +1,18 @@
 services:
+    text_reparser.manager:
+        class: phpbb\textreparser\manager
+        arguments:
+            - @config
+            - @config_text
+            - @text_reparser_collection
+
+    text_reparser.lock:
+        class: phpbb\lock\db
+        arguments:
+            - reparse_lock
+            - @config
+            - @dbal.conn
+
     text_reparser_collection:
         class: phpbb\di\service_collection
         arguments: