aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-06-15 10:02:02 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-09-14 13:50:42 +0200
commitd66cae7cbcf9fb2d8105b1c62c3876dd3f4c0c14 (patch)
tree23a7fcd133aae12fd0b12d3e03fdf0bcb9784040
parent3a0dd248d05e2b15a2c899fc72cb3f122c216917 (diff)
downloadforums-d66cae7cbcf9fb2d8105b1c62c3876dd3f4c0c14.tar
forums-d66cae7cbcf9fb2d8105b1c62c3876dd3f4c0c14.tar.gz
forums-d66cae7cbcf9fb2d8105b1c62c3876dd3f4c0c14.tar.bz2
forums-d66cae7cbcf9fb2d8105b1c62c3876dd3f4c0c14.tar.xz
forums-d66cae7cbcf9fb2d8105b1c62c3876dd3f4c0c14.zip
[feature/passwords] Add service collection file crypto.yml
This will contain definitions of the services and the service collection that will be passed to the passwords manager. PHPBB3-11610
-rw-r--r--phpBB/config/crypto.yml35
-rw-r--r--phpBB/config/services.yml1
2 files changed, 36 insertions, 0 deletions
diff --git a/phpBB/config/crypto.yml b/phpBB/config/crypto.yml
new file mode 100644
index 0000000000..03a7cdce2e
--- /dev/null
+++ b/phpBB/config/crypto.yml
@@ -0,0 +1,35 @@
+services:
+ crypto.driver.bcrypt:
+ class: phpbb_crypto_driver_bcrypt
+ arguments:
+ - @config
+ tags:
+ - { name: crypto.driver }
+
+ crypto.driver.bcrypt_2y:
+ class: phpbb_crypto_driver_bcrypt_2y
+ arguments:
+ - @config
+ tags:
+ - { name: crypto.driver }
+
+ crypto.driver.salted_md5:
+ class: phpbb_crypto_driver_salted_md5
+ arguments:
+ - @config
+ tags:
+ - { name: crypto.driver }
+
+ crypto.driver.phpass:
+ class: phpbb_crypto_driver_phpass
+ arguments:
+ - @config
+ tags:
+ - { name: crypto.driver }
+
+ crypto.driver_collection:
+ class: phpbb_di_service_collection
+ arguments:
+ - @service_container
+ tags:
+ - { name: service_collection, tag: crypto.driver }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 32dd2759b3..e7c3232fa7 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -6,6 +6,7 @@ imports:
- { resource: avatars.yml }
- { resource: feed.yml }
- { resource: auth_providers.yml }
+ - { resource: crypto.yml }
services:
acl.permissions: