aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-10-23 18:34:06 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-10-23 18:34:06 +0200
commit789d49359510f10c68be61eaa56d77b3ab428328 (patch)
treece556ce9fc62b58a31c4de5ac31f93cf97f5e330 /phpBB/config
parentd612041cd19d5bea7d08f80a2d952123699aa30e (diff)
downloadforums-789d49359510f10c68be61eaa56d77b3ab428328.tar
forums-789d49359510f10c68be61eaa56d77b3ab428328.tar.gz
forums-789d49359510f10c68be61eaa56d77b3ab428328.tar.bz2
forums-789d49359510f10c68be61eaa56d77b3ab428328.tar.xz
forums-789d49359510f10c68be61eaa56d77b3ab428328.zip
[ticket/11912] Integrate mimetype guesser with plupload
PHPBB3-11912
Diffstat (limited to 'phpBB/config')
-rw-r--r--phpBB/config/mimetype_guessers.yml22
-rw-r--r--phpBB/config/services.yml2
2 files changed, 24 insertions, 0 deletions
diff --git a/phpBB/config/mimetype_guessers.yml b/phpBB/config/mimetype_guessers.yml
new file mode 100644
index 0000000000..1b5cdee97d
--- /dev/null
+++ b/phpBB/config/mimetype_guessers.yml
@@ -0,0 +1,22 @@
+services:
+ mimetype.FileinfoMimeTypeGuesser:
+ class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser
+ tags:
+ - { name: mimetype.guessers }
+
+ mimetype.FileBinaryMimeTypeGuesser:
+ class: Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser
+ 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
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index c6490a21d7..09fcb5dc8f 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: mimetype_guessers.yml }
services:
acl.permissions:
@@ -266,6 +267,7 @@ services:
- @request
- @user
- @php_ini
+ - @mimetype.guesser
request:
class: phpbb\request\request