1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2019-11-17 14:55:30 +01:00
16 changed files with 448 additions and 326 deletions

View File

@@ -15,12 +15,12 @@ services:
auth.provider.db:
class: phpbb\auth\provider\db
arguments:
- '@dbal.conn'
- '@captcha.factory'
- '@config'
- '@dbal.conn'
- '@passwords.manager'
- '@request'
- '@user'
- '@service_container'
- '%core.root_path%'
- '%core.php_ext%'
tags:
@@ -29,9 +29,9 @@ services:
auth.provider.apache:
class: phpbb\auth\provider\apache
arguments:
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@dbal.conn'
- '@language'
- '@request'
- '@user'
- '%core.root_path%'
@@ -42,9 +42,9 @@ services:
auth.provider.ldap:
class: phpbb\auth\provider\ldap
arguments:
- '@dbal.conn'
- '@config'
- '@passwords.manager'
- '@dbal.conn'
- '@language'
- '@user'
tags:
- { name: auth.provider }
@@ -53,11 +53,10 @@ services:
class: phpbb\auth\provider\oauth\oauth
arguments:
- '@config'
- '@service_container'
- '@dbal.conn'
- '@auth.provider.db'
- '@dispatcher'
- '@language'
- '@passwords.manager'
- '@request'
- '@auth.provider.oauth.service_collection'
- '@user'