6 files changed, 41 insertions, 26 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index 0c54951cbd..206df86543 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -48,6 +48,12 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
 	protected $php_ext;
 
 	/**
+	* Path Helper
+	* @var \phpbb\path_helper
+	*/
+	protected $path_helper;
+
+	/**
 	* Cache driver
 	* @var \phpbb\cache\driver\driver_interface
 	*/
@@ -75,13 +81,15 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
 	* @param \phpbb\request\request $request Request object
 	* @param string $phpbb_root_path Path to the phpBB root
 	* @param string $php_ext PHP file extension
+	* @param \phpbb_path_helper $path_helper phpBB path helper
 	* @param \phpbb\cache\driver\driver_interface $cache Cache driver
 	*/
-	public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\cache\driver\driver_interface $cache = null)
+	public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null)
 	{
 		$this->config = $config;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
+		$this->path_helper = $path_helper;
 		$this->cache = $cache;
 	}
 
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index d779099c46..0686ffe79a 100644
--- a/phpBB/phpbb/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
@@ -29,7 +29,7 @@ class local extends \phpbb\avatar\driver\driver
 	public function get_data($row)
 	{
 		return array(
-			'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
+			'src' => $this->path_helper->get_web_root_path() . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
 			'width' => $row['avatar_width'],
 			'height' => $row['avatar_height'],
 		);
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 377c9a0b04..bda872df7a 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -29,7 +29,7 @@ class upload extends \phpbb\avatar\driver\driver
 	public function get_data($row, $ignore_config = false)
 	{
 		return array(
-			'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'],
+			'src' => $this->path_helper->get_web_root_path() . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'],
 			'width' => $row['avatar_width'],
 			'height' => $row['avatar_height'],
 		);
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index c28380a401..7c26bce5ae 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -42,12 +42,6 @@ class manager
 	protected $avatar_drivers;
 
 	/**
-	* Service container object
-	* @var object
-	*/
-	protected $container;
-
-	/**
 	* Default avatar data row
 	* @var array
 	*/
@@ -63,13 +57,27 @@ class manager
 	*
 	* @param \phpbb\config\config $config phpBB configuration
 	* @param array $avatar_drivers Avatar drivers passed via the service container
-	* @param object $container Container object
 	*/
-	public function __construct(\phpbb\config\config $config, $avatar_drivers, $container)
+	public function __construct(\phpbb\config\config $config, $avatar_drivers)
 	{
 		$this->config = $config;
-		$this->avatar_drivers = $avatar_drivers;
-		$this->container = $container;
+		$this->register_avatar_drivers($avatar_drivers);
+	}
+
+	/**
+	* Register avatar drivers
+	*
+	* @param array $avatar_drivers Service collection of avatar drivers
+	*/
+	protected function register_avatar_drivers($avatar_drivers)
+	{
+		if (!empty($avatar_drivers))
+		{
+			foreach ($avatar_drivers as $driver)
+			{
+				$this->avatar_drivers[$driver->get_name()] = $driver;
+			}
+		}
 	}
 
 	/**
@@ -112,7 +120,7 @@ class manager
 		* There is no need to handle invalid avatar types as the following code
 		* will cause a ServiceNotFoundException if the type does not exist
 		*/
-		$driver = $this->container->get($avatar_type);
+		$driver = $this->avatar_drivers[$avatar_type];
 
 		return $driver;
 	}
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index 3aad08e3aa..048ca72084 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -31,17 +31,17 @@ class provider
 	* YAML file(s) containing route information
 	* @var array
 	*/
-	protected $routing_paths;
+	protected $routing_files;
 
 	/**
 	* Construct method
 	*
-	* @param array() $routing_paths Array of strings containing paths
+	* @param array() $routing_files Array of strings containing paths
 	*							to YAML files holding route information
 	*/
-	public function __construct($routing_paths = array())
+	public function __construct($routing_files = array())
 	{
-		$this->routing_paths = $routing_paths;
+		$this->routing_files = $routing_files;
 	}
 
 	/**
@@ -54,12 +54,11 @@ class provider
 	{
 		// We hardcode the path to the core config directory
 		// because the finder cannot find it
-		$this->routing_paths = array_merge(array('config'), array_map('dirname', array_keys($finder
+		$this->routing_files = array_merge(array('config/routing.yml'), array_keys($finder
 			->directory('config')
-			->prefix('routing')
-			->suffix('yml')
+			->suffix('routing.yml')
 			->find()
-		)));
+		));
 
 		return $this;
 	}
@@ -73,10 +72,10 @@ class provider
 	public function find($base_path = '')
 	{
 		$routes = new RouteCollection;
-		foreach ($this->routing_paths as $path)
+		foreach ($this->routing_files as $file_path)
 		{
-			$loader = new YamlFileLoader(new FileLocator($base_path . $path));
-			$routes->addCollection($loader->load('routing.yml'));
+			$loader = new YamlFileLoader(new FileLocator($base_path));
+			$routes->addCollection($loader->load($file_path));
 		}
 
 		return $routes;
diff --git a/phpBB/phpbb/db/migration/data/v310/plupload.php b/phpBB/phpbb/db/migration/data/v310/plupload.php
index 1787c6dafc..7cdba507a2 100644
--- a/phpBB/phpbb/db/migration/data/v310/plupload.php
+++ b/phpBB/phpbb/db/migration/data/v310/plupload.php
@@ -19,7 +19,7 @@ class plupload extends \phpbb\db\migration\migration
 
 	static public function depends_on()
 	{
-		return array('\phpbb\db\migration\data\310\dev');
+		return array('\phpbb\db\migration\data\v310\dev');
 	}
 
 	public function update_data()