[ticket/15276] Resolve conflicts

PHPBB3-15276

phpBB/config/default/container/services_files.yml

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

phpBB/config/default/container/services_storage.yml

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

phpBB/phpbb/storage/adapter/adapter_interface.php

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