[ticket/12620] Fix rebase (move config file to the right directory)

PHPBB3-12620
author: Tristan Darricau <github@nicofuma.fr> 2014-11-07 14:27:00 +0100
committer: Tristan Darricau <github@nicofuma.fr> 2014-11-20 21:00:01 +0100
commit: c98efc53a80150b6f9189c9b194855c748e9b03d (patch)
tree: c82af6d71d9893b3a60fca428fd507b1dbf0afeb /phpBB/config/default/container
parent: 0b61e3540de353f2bf0a6904a87727e4efe9c5fa (diff)
download: forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.gz
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.bz2
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.xz
forums-c98efc53a80150b6f9189c9b194855c748e9b03d.zip
11 files changed, 323 insertions, 77 deletions
diff --git a/phpBB/config/default/container/services_auth_providers.yml b/phpBB/config/default/container/services_auth.yml
index 89303a684a..88a90ca2d6 100644
--- a/phpBB/config/default/container/services_auth_providers.yml
+++ b/phpBB/config/default/container/services_auth.yml
@@ -1,4 +1,9 @@
 services:
+# ----- Auth management -----
+    auth:
+        class: phpbb\auth\auth
+
+# ----- Auth providers -----
     auth.provider_collection:
         class: phpbb\auth\provider_collection
         arguments:
@@ -6,6 +11,7 @@ services:
             - @config
         tags:
             - { name: service_collection, tag: auth.provider }
+
     auth.provider.db:
         class: phpbb\auth\provider\db
         arguments:
@@ -19,6 +25,7 @@ services:
             - %core.php_ext%
         tags:
             - { name: auth.provider }
+
     auth.provider.apache:
         class: phpbb\auth\provider\apache
         arguments:
@@ -31,6 +38,7 @@ services:
             - %core.php_ext%
         tags:
             - { name: auth.provider }
+
     auth.provider.ldap:
         class: phpbb\auth\provider\ldap
         arguments:
@@ -40,6 +48,7 @@ services:
             - @user
         tags:
             - { name: auth.provider }
+
     auth.provider.oauth:
         class: phpbb\auth\provider\oauth\oauth
         arguments:
@@ -57,12 +66,15 @@ services:
             - %core.php_ext%
         tags:
             - { name: auth.provider }
+
+# ----- OAuth services providers -----
     auth.provider.oauth.service_collection:
         class: phpbb\di\service_collection
         arguments:
             - @service_container
         tags:
             - { name: service_collection, tag: auth.provider.oauth.service }
+
     auth.provider.oauth.service.bitly:
         class: phpbb\auth\provider\oauth\service\bitly
         arguments:
@@ -70,6 +82,7 @@ services:
             - @request
         tags:
             - { name: auth.provider.oauth.service }
+
     auth.provider.oauth.service.facebook:
         class: phpbb\auth\provider\oauth\service\facebook
         arguments:
@@ -77,6 +90,7 @@ services:
             - @request
         tags:
             - { name: auth.provider.oauth.service }
+
     auth.provider.oauth.service.google:
         class: phpbb\auth\provider\oauth\service\google
         arguments:
diff --git a/phpBB/config/default/container/services_avatars.yml b/phpBB/config/default/container/services_avatar.yml
index 8e5b1fdbfe..5292489715 100644
--- a/phpBB/config/default/container/services_avatars.yml
+++ b/phpBB/config/default/container/services_avatar.yml
@@ -1,4 +1,18 @@
 services:
+    avatar.manager:
+        class: phpbb\avatar\manager
+        arguments:
+            - @config
+            - @avatar.driver_collection
+
+# ----- Avatar drivers -----
+    avatar.driver_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: avatar.driver }
+
     avatar.driver.gravatar:
         class: phpbb\avatar\driver\gravatar
         arguments:
@@ -51,10 +65,3 @@ services:
             - [set_name, [avatar.driver.upload]]
         tags:
             - { name: avatar.driver }
-
-    avatar.driver_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: avatar.driver }
diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml
new file mode 100644
index 0000000000..f0985f0292
--- /dev/null
+++ b/phpBB/config/default/container/services_content.yml
@@ -0,0 +1,71 @@
+services:
+    content.visibility:
+        class: phpbb\content_visibility
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.forums%
+            - %tables.posts%
+            - %tables.topics%
+            - %tables.users%
+
+    groupposition.legend:
+        class: phpbb\groupposition\legend
+        arguments:
+            - @dbal.conn
+            - @user
+
+    groupposition.teampage:
+        class: phpbb\groupposition\teampage
+        arguments:
+            - @dbal.conn
+            - @user
+            - @cache.driver
+
+    message.form.admin:
+        class: phpbb\message\admin_form
+        arguments:
+            - @auth
+            - @config
+            - @config_text
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+
+    message.form.topic:
+        class: phpbb\message\topic_form
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+
+    message.form.user:
+        class: phpbb\message\user_form
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+
+    pagination:
+        class: phpbb\pagination
+        arguments:
+            - @template
+            - @user
+            - @controller.helper
+            - @dispatcher
+
+    viewonline_helper:
+        class: phpbb\viewonline_helper
+        arguments:
+            - @filesystem
diff --git a/phpBB/config/default/container/services_cron_tasks.yml b/phpBB/config/default/container/services_cron.yml
index acf9a48bf9..7a90c39733 100644
--- a/phpBB/config/default/container/services_cron_tasks.yml
+++ b/phpBB/config/default/container/services_cron.yml
@@ -1,4 +1,26 @@
 services:
+    cron.manager:
+        class: phpbb\cron\manager
+        arguments:
+            - @cron.task_collection
+            - %core.root_path%
+            - %core.php_ext%
+
+    cron.lock_db:
+        class: phpbb\lock\db
+        arguments:
+            - cron_lock
+            - @config
+            - @dbal.conn
+
+# ----- Cron tasks -----
+    cron.task_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: cron.task }
+
     cron.task.core.prune_all_forums:
         class: phpbb\cron\task\core\prune_all_forums
         arguments:
diff --git a/phpBB/config/default/container/services_db.yml b/phpBB/config/default/container/services_db.yml
new file mode 100644
index 0000000000..b3f1b485ea
--- /dev/null
+++ b/phpBB/config/default/container/services_db.yml
@@ -0,0 +1,77 @@
+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:
+            - @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/default/container/services_event.yml b/phpBB/config/default/container/services_event.yml
new file mode 100644
index 0000000000..1ccef78f9b
--- /dev/null
+++ b/phpBB/config/default/container/services_event.yml
@@ -0,0 +1,25 @@
+services:
+    dispatcher:
+        class: phpbb\event\dispatcher
+        arguments:
+            - @service_container
+
+    hook_finder:
+        class: phpbb\hook\finder
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @cache.driver
+
+    kernel_exception_subscriber:
+        class: phpbb\event\kernel_exception_subscriber
+        arguments:
+            - @template
+            - @user
+        tags:
+            - { name: kernel.event_subscriber }
+
+    kernel_terminate_subscriber:
+        class: phpbb\event\kernel_terminate_subscriber
+        tags:
+            - { name: kernel.event_subscriber }
diff --git a/phpBB/config/default/container/services_mimetype_guessers.yml b/phpBB/config/default/container/services_mimetype_guesser.yml
index 0115146deb..2e89ed3c1f 100644
--- a/phpBB/config/default/container/services_mimetype_guessers.yml
+++ b/phpBB/config/default/container/services_mimetype_guesser.yml
@@ -1,11 +1,11 @@
-parameters:
-    mimetype.guesser.priority.lowest: -2
-    mimetype.guesser.priority.low: -1
-    mimetype.guesser.priority.default: 0
-    mimetype.guesser.priority.high: 1
-    mimetype.guesser.priority.highest: 2
-
 services:
+    mimetype.guesser_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: mimetype.guessers }
+
     mimetype.fileinfo_mimetype_guesser:
         class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser
         tags:
@@ -30,13 +30,6 @@ services:
         tags:
             - { name: mimetype.guessers }
 
-    mimetype.guesser_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: mimetype.guessers }
-
     mimetype.guesser:
         class: phpbb\mimetype\guesser
         arguments:
diff --git a/phpBB/config/default/container/services_notifications.yml b/phpBB/config/default/container/services_notification.yml
index 5675e76a99..add577be2c 100644
--- a/phpBB/config/default/container/services_notifications.yml
+++ b/phpBB/config/default/container/services_notification.yml
@@ -1,21 +1,33 @@
 services:
-    notification.type_collection:
-        class: phpbb\di\service_collection
+    notification_manager:
+        class: phpbb\notification\manager
         arguments:
+            - @notification.type_collection
+            - @notification.method_collection
             - @service_container
-        tags:
-            - { name: service_collection, tag: notification.type }
+            - @user_loader
+            - @config
+            - @dbal.conn
+            - @cache
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.notification_types%
+            - %tables.notifications%
+            - %tables.user_notifications%
 
-    notification.method_collection:
+# ----- Notification's types -----
+# Scope MUST be prototype for all the plugins to work.
+    notification.type_collection:
         class: phpbb\di\service_collection
         arguments:
             - @service_container
         tags:
-            - { name: service_collection, tag: notification.method }
+            - { name: service_collection, tag: notification.type }
 
     notification.type.approve_post:
         class: phpbb\notification\type\approve_post
-        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -33,7 +45,7 @@ services:
 
     notification.type.approve_topic:
         class: phpbb\notification\type\approve_topic
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -51,7 +63,7 @@ services:
 
     notification.type.bookmark:
         class: phpbb\notification\type\bookmark
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -69,7 +81,7 @@ services:
 
     notification.type.disapprove_post:
         class: phpbb\notification\type\disapprove_post
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -87,7 +99,7 @@ services:
 
     notification.type.disapprove_topic:
         class: phpbb\notification\type\disapprove_topic
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -105,7 +117,7 @@ services:
 
     notification.type.group_request:
         class: phpbb\notification\type\group_request
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -123,7 +135,7 @@ services:
 
     notification.type.group_request_approved:
         class: phpbb\notification\type\group_request_approved
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -141,7 +153,7 @@ services:
 
     notification.type.pm:
         class: phpbb\notification\type\pm
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -159,7 +171,7 @@ services:
 
     notification.type.post:
         class: phpbb\notification\type\post
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -177,7 +189,7 @@ services:
 
     notification.type.post_in_queue:
         class: phpbb\notification\type\post_in_queue
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -195,7 +207,7 @@ services:
 
     notification.type.quote:
         class: phpbb\notification\type\quote
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -213,7 +225,7 @@ services:
 
     notification.type.report_pm:
         class: phpbb\notification\type\report_pm
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -231,7 +243,7 @@ services:
 
     notification.type.report_pm_closed:
         class: phpbb\notification\type\report_pm_closed
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -249,7 +261,7 @@ services:
 
     notification.type.report_post:
         class: phpbb\notification\type\report_post
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -267,7 +279,7 @@ services:
 
     notification.type.report_post_closed:
         class: phpbb\notification\type\report_post_closed
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -285,7 +297,7 @@ services:
 
     notification.type.topic:
         class: phpbb\notification\type\topic
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -303,7 +315,7 @@ services:
 
     notification.type.topic_in_queue:
         class: phpbb\notification\type\topic_in_queue
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -321,7 +333,7 @@ services:
 
     notification.type.admin_activate_user:
         class: phpbb\notification\type\admin_activate_user
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -336,10 +348,19 @@ services:
             - %tables.user_notifications%
         tags:
             - { name: notification.type }
+            
+# ----- Notification's methods -----
+# Scope MUST be prototype for all the plugins to work.
+    notification.method_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: notification.method }
 
     notification.method.email:
         class: phpbb\notification\method\email
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -354,7 +375,7 @@ services:
 
     notification.method.jabber:
         class: phpbb\notification\method\jabber
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
diff --git a/phpBB/config/default/container/services_passwords.yml b/phpBB/config/default/container/services_password.yml
index 3dc217286f..cb45ec3d42 100644
--- a/phpBB/config/default/container/services_passwords.yml
+++ b/phpBB/config/default/container/services_password.yml
@@ -1,11 +1,29 @@
-parameters:
-    passwords.algorithms:
-        - passwords.driver.bcrypt_2y
-        - passwords.driver.bcrypt
-        - passwords.driver.salted_md5
-        - passwords.driver.phpass
-
 services:
+# ----- Password management -----
+    passwords.manager:
+        class: phpbb\passwords\manager
+        arguments:
+            - @config
+            - @passwords.driver_collection
+            - @passwords.helper
+            - %passwords.algorithms%
+
+    passwords.helper:
+        class: phpbb\passwords\helper
+
+    passwords.driver_helper:
+        class: phpbb\passwords\driver\helper
+        arguments:
+            - @config
+
+# ----- Password's drivers -----
+    passwords.driver_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: passwords.driver }
+
     passwords.driver.bcrypt:
         class: phpbb\passwords\driver\bcrypt
         arguments:
@@ -83,6 +101,7 @@ services:
         arguments:
             - @request
             - @passwords.driver.salted_md5
+            - @passwords.driver_helper
             - %core.root_path%
             - %core.php_ext%
         tags:
@@ -103,26 +122,3 @@ services:
             - @passwords.driver_helper
         tags:
             - { name: passwords.driver }
-
-    passwords.driver_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: passwords.driver }
-
-    passwords.driver_helper:
-        class: phpbb\passwords\driver\helper
-        arguments:
-            - @config
-
-    passwords.manager:
-        class: phpbb\passwords\manager
-        arguments:
-            - @config
-            - @passwords.driver_collection
-            - @passwords.helper
-            - %passwords.algorithms%
-
-    passwords.helper:
-        class: phpbb\passwords\helper
diff --git a/phpBB/config/default/container/services_profilefields.yml b/phpBB/config/default/container/services_profilefield.yml
index ce2a84b12b..5ccfef9148 100644
--- a/phpBB/config/default/container/services_profilefields.yml
+++ b/phpBB/config/default/container/services_profilefield.yml
@@ -19,6 +19,7 @@ services:
             - @dbal.conn
             - %tables.profile_fields_options_language%
 
+# ----- Profile fields types -----
     profilefields.type_collection:
         class: phpbb\di\service_collection
         arguments:
diff --git a/phpBB/config/default/container/services_user.yml b/phpBB/config/default/container/services_user.yml
new file mode 100644
index 0000000000..1ca853ea45
--- /dev/null
+++ b/phpBB/config/default/container/services_user.yml
@@ -0,0 +1,19 @@
+services:
+    acl.permissions:
+        class: phpbb\permissions
+        arguments:
+            - @dispatcher
+            - @user
+
+    user:
+        class: phpbb\user
+        arguments:
+            - %datetime.class%
+
+    user_loader:
+        class: phpbb\user_loader
+        arguments:
+            - @dbal.conn
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.users%
author	Tristan Darricau <github@nicofuma.fr>	2014-11-07 14:27:00 +0100
committer	Tristan Darricau <github@nicofuma.fr>	2014-11-20 21:00:01 +0100
commit	c98efc53a80150b6f9189c9b194855c748e9b03d (patch)
tree	c82af6d71d9893b3a60fca428fd507b1dbf0afeb /phpBB/config/default/container
parent	0b61e3540de353f2bf0a6904a87727e4efe9c5fa (diff)
download	forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.gz forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.bz2 forums-c98efc53a80150b6f9189c9b194855c748e9b03d.tar.xz forums-c98efc53a80150b6f9189c9b194855c748e9b03d.zip