diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-16 11:55:13 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-16 11:55:13 +0200 |
| commit | a562fea2306c8ba5b47a161568bea5fbe2ffd19f (patch) | |
| tree | fcab88a3a5dd5f05c77934eef0983793f2e2bd6a /phpBB/config | |
| parent | d4a47409f7da09790f38d3418401cbe34f8c3703 (diff) | |
| parent | 6651c1d8f4aead15f4750989670f75721390ee21 (diff) | |
| download | forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.gz forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.bz2 forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.xz forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.zip | |
Merge pull request #3727 from marc1706/ticket/13904
[ticket/13904] Refactor attachments functions into service
* marc1706/ticket/13904: (66 commits)
[ticket/13904] Use filespec's get_filesize instead of calling filesize()
[ticket/13904] Set properties to protected where possible in filespec
[ticket/13904] Fix tests after changes to factory
[ticket/13904] Minor coding style fixes
[ticket/13904] Add language entries for error messages in upload class
[ticket/13904] Modify files for updated fast-image-size library
[ticket/13904] Update composer.lock
[ticket/13904] Improve code coverage
[ticket/13904] Add unit tests for local upload type
[ticket/13904] Minor coding style fixes
[ticket/13904] Improve test coverage of base upload type class
[ticket/13904] Improve test coverage of remote upload type
[ticket/13904] Improve test coverage of form upload type
[ticket/13904] Improve test coverage of filespec class
[ticket/13904] Add back tests for retrieving floats
[ticket/13904] Use ini_get() wrapper in file upload types
[ticket/13904] Modify files for changes in ini wrapper
[ticket/13904] Add bantu/ini-get-wrapper to composer.json
[ticket/13904] Switch around constructor arguments
[ticket/13904] Use \phpbb\php\ini class for ini_get()
...
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/default/container/services_avatar.yml | 2 | ||||
| -rw-r--r-- | phpBB/config/default/container/services_files.yml | 57 | ||||
| -rw-r--r-- | phpBB/config/default/container/services_php.yml | 2 |
3 files changed, 59 insertions, 2 deletions
diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml index 1b0c109298..76057cf5a7 100644 --- a/phpBB/config/default/container/services_avatar.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -63,8 +63,8 @@ services: - %core.php_ext% - @filesystem - @path_helper - - @mimetype.guesser - @dispatcher + - @files.factory - @cache.driver calls: - [set_name, [avatar.driver.upload]] diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 828f9076dd..cfdade37df 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -1,3 +1,60 @@ services: filesystem: class: phpbb\filesystem\filesystem + + files.factory: + class: phpbb\files\factory + arguments: + - @service_container + + files.filespec: + class: phpbb\files\filespec + scope: prototype + arguments: + - @filesystem + - @language + - @php_ini + - @upload_imagesize + - %core.root_path% + - @mimetype.guesser + - @plupload + + files.upload: + class: phpbb\files\upload + scope: prototype + arguments: + - @filesystem + - @files.factory + - @language + - @php_ini + - @request + - %core.root_path% + + files.types.form: + class: phpbb\files\types\form + scope: prototype + arguments: + - @files.factory + - @language + - @php_ini + - @plupload + - @request + + files.types.local: + class: phpbb\files\types\form + scope: prototype + arguments: + - @files.factory + - @language + - @php_ini + - @request + + files.types.remote: + class: phpbb\files\types\remote + scope: prototype + arguments: + - @files.factory + - @language + - @php_ini + - @request + - %core.root_path% diff --git a/phpBB/config/default/container/services_php.yml b/phpBB/config/default/container/services_php.yml index 8aabc7341f..29349960f3 100644 --- a/phpBB/config/default/container/services_php.yml +++ b/phpBB/config/default/container/services_php.yml @@ -1,3 +1,3 @@ services: php_ini: - class: phpbb\php\ini + class: bantu\IniGetWrapper\IniGetWrapper |