mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/15276] Resolve conflicts

Browse Source 
PHPBB3-15276
This commit is contained in:
Rubén Calvo
2017-07-20 07:56:05 +02:00
parent 0417482d55
commit ef00bb4da5
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/config/default/container/services_files.yml
View File

@@ -12,6 +12,7 @@ services:
- '@language' - '@language'
- '@php_ini' - '@php_ini'
- '@upload_imagesize' - '@upload_imagesize'
- '%core.root_path%'
- '@mimetype.guesser' - '@mimetype.guesser'
- '@plupload' - '@plupload'

1
phpBB/config/default/container/services_storage.yml
View File

@@ -12,7 +12,6 @@ services:
class: phpbb\storage\adapter_factory class: phpbb\storage\adapter_factory
arguments: arguments:
- '@config' - '@config'
- '@service_container'
- '@storage.adapter_collection' - '@storage.adapter_collection'
- '@storage.provider_collection' - '@storage.provider_collection'

7
phpBB/phpbb/storage/adapter/adapter_interface.php
View File

@@ -22,13 +22,6 @@ interface adapter_interface
*/ */
public function configure($options); public function configure($options);
/**
* Dumps content into a file.
*
* @param array options Storage-specific options.
*/
public function configure($options);
/** /**
* Dumps content into a file. * Dumps content into a file.
* *