mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 15:01:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords

Browse Source 
Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Marc Alexander
2013-12-29 13:46:42 +01:00
parent ac131a5159 db94f80c5b
commit 382317b135
619 changed files with 13392 additions and 5996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/config/avatars.yml
View File

@@ -5,6 +5,7 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
- @path_helper
- @cache.driver
calls:
- [set_name, [avatar.driver.gravatar]]
@@ -17,6 +18,7 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
- @path_helper
- @cache.driver
calls:
- [set_name, [avatar.driver.local]]
@@ -29,6 +31,7 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
- @path_helper
- @cache.driver
calls:
- [set_name, [avatar.driver.remote]]
@@ -41,6 +44,7 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
- @path_helper
- @cache.driver
calls:
- [set_name, [avatar.driver.upload]]

35
phpBB/config/console.yml Normal file
View File

@@ -0,0 +1,35 @@
services:
console.command.extension.disable:
class: phpbb\console\command\extension\disable
arguments:
- @ext.manager
tags:
- { name: console.command }
console.command.extension.enable:
class: phpbb\console\command\extension\enable
arguments:
- @ext.manager
tags:
- { name: console.command }
console.command.extension.purge:
class: phpbb\console\command\extension\purge
arguments:
- @ext.manager
tags:
- { name: console.command }
console.command.extension.show:
class: phpbb\console\command\extension\show
arguments:
- @ext.manager
tags:
- { name: console.command }
console.command.fixup.recalculate_email_hash:
class: phpbb\console\command\fixup\recalculate_email_hash
arguments:
- @dbal.conn
tags:
- { name: console.command }

20
phpBB/config/cron_tasks.yml
View File

@@ -23,6 +23,16 @@ services:
tags:
- { name: cron.task }
cron.task.core.prune_notifications:
class: phpbb\cron\task\core\prune_notifications
arguments:
- @config
- @notification_manager
calls:
- [set_name, [cron.task.core.prune_notifications]]
tags:
- { name: cron.task }
cron.task.core.queue:
class: phpbb\cron\task\core\queue
arguments:
@@ -55,6 +65,16 @@ services:
tags:
- { name: cron.task }
cron.task.core.tidy_plupload:
class: phpbb\cron\task\core\tidy_plupload
arguments:
- %core.root_path%
- @config
calls:
- [set_name, [cron.task.core.tidy_plupload]]
tags:
- { name: cron.task }
cron.task.core.tidy_search:
class: phpbb\cron\task\core\tidy_search
arguments:

43
phpBB/config/mimetype_guessers.yml Normal file
View File

@@ -0,0 +1,43 @@
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.fileinfo_mimetype_guesser:
class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser
tags:
- { name: mimetype.guessers }
mimetype.filebinary_mimetype_guesser:
class: Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser
tags:
- { name: mimetype.guessers }
mimetype.content_guesser:
class: phpbb\mimetype\content_guesser
calls:
- [set_priority, [%mimetype.guesser.priority.low%]]
tags:
- { name: mimetype.guessers }
mimetype.extension_guesser:
class: phpbb\mimetype\extension_guesser
calls:
- [set_priority, [%mimetype.guesser.priority.lowest%]]
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:
- @mimetype.guesser_collection

20
phpBB/config/notifications.yml
View File

@@ -266,7 +266,7 @@ services:
- { name: notification.type }
notification.type.report_post_closed:
class: phpbb\notification\type\report_post
class: phpbb\notification\type\report_post_closed
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
@@ -319,6 +319,24 @@ services:
tags:
- { name: notification.type }
notification.type.admin_activate_user:
class: phpbb\notification\type\admin_activate_user
scope: prototype # scope MUST be prototype for this to work!
arguments:
- @user_loader
- @dbal.conn
- @cache.driver
- @user
- @auth
- @config
- %core.root_path%
- %core.php_ext%
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
tags:
- { name: notification.type }
notification.method.email:
class: phpbb\notification\method\email
scope: prototype # scope MUST be prototype for this to work!

29
phpBB/config/services.yml
View File

@@ -6,6 +6,8 @@ imports:
- { resource: avatars.yml }
- { resource: feed.yml }
- { resource: auth_providers.yml }
- { resource: console.yml }
- { resource: mimetype_guessers.yml }
- { resource: passwords.yml }
services:
@@ -23,7 +25,6 @@ services:
arguments:
- @config
- @avatar.driver_collection
- @service_container
cache:
class: phpbb\cache\service
@@ -142,10 +143,17 @@ services:
class: phpbb\event\extension_subscriber_loader
arguments:
- @dispatcher
- @ext.manager
- @event.listener_collection
calls:
- [load, []]
event.listener_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: event.listener }
ext.manager:
class: phpbb\extension\manager
arguments:
@@ -238,6 +246,7 @@ services:
- @notification.method_collection
- @service_container
- @user_loader
- @config
- @dbal.conn
- @cache
- @user
@@ -247,6 +256,12 @@ services:
- %tables.notifications%
- %tables.user_notifications%
pagination:
class: phpbb\pagination
arguments:
- @template
- @user
path_helper:
class: phpbb\path_helper
arguments:
@@ -259,6 +274,16 @@ services:
php_ini:
class: phpbb\php\ini
plupload:
class: phpbb\plupload\plupload
arguments:
- %core.root_path%
- @config
- @request
- @user
- @php_ini
- @mimetype.guesser
request:
class: phpbb\request\request