4 files changed, 35 insertions, 22 deletions
diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php
index 4f44efe9af..9137a77210 100644
--- a/phpBB/phpbb/auth/provider/apache.php
+++ b/phpBB/phpbb/auth/provider/apache.php
@@ -28,13 +28,13 @@ class apache extends \phpbb\auth\provider\base
 	/**
 	 * Apache Authentication Constructor
 	 *
-	 * @param 	\phpbb\db\driver\driver_interface 	$db
-	 * @param 	\phpbb\config\config 		$config
-	 * @param	\phpbb\passwords\manager	$passwords_manager
-	 * @param 	\phpbb\request\request 		$request
-	 * @param 	\phpbb\user 			$user
-	 * @param 	string 				$phpbb_root_path
-	 * @param 	string 				$php_ext
+	 * @param	\phpbb\db\driver\driver_interface 	$db		Database object
+	 * @param	\phpbb\config\config 		$config		Config object
+	 * @param	\phpbb\passwords\manager	$passwords_manager		Passwords Manager object
+	 * @param	\phpbb\request\request 		$request		Request object
+	 * @param	\phpbb\user 			$user		User object
+	 * @param	string 				$phpbb_root_path		Relative path to phpBB root
+	 * @param	string 				$php_ext		PHP file extension
 	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext)
 	{
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index 142a47247f..722eeffa9a 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -27,6 +27,13 @@ class db extends \phpbb\auth\provider\base
 	protected $passwords_manager;
 
 	/**
+	* DI container
+	*
+	* @var \Symfony\Component\DependencyInjection\ContainerInterface
+	*/
+	protected $phpbb_container;
+
+	/**
 	 * Database Authentication Constructor
 	 *
 	 * @param	\phpbb\db\driver\driver_interface		$db
@@ -34,10 +41,11 @@ class db extends \phpbb\auth\provider\base
 	 * @param	\phpbb\passwords\manager	$passwords_manager
 	 * @param	\phpbb\request\request		$request
 	 * @param	\phpbb\user			$user
+	 * @param	\Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container DI container
 	 * @param	string				$phpbb_root_path
 	 * @param	string				$php_ext
 	 */
-	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request $request, \phpbb\user $user, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request $request, \phpbb\user $user, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->config = $config;
@@ -46,6 +54,7 @@ class db extends \phpbb\auth\provider\base
 		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
+		$this->phpbb_container = $phpbb_container;
 	}
 
 	/**
@@ -146,13 +155,8 @@ class db extends \phpbb\auth\provider\base
 		// Every auth module is able to define what to do by itself...
 		if ($show_captcha)
 		{
-			// Visual Confirmation handling
-			if (!class_exists('phpbb_captcha_factory', false))
-			{
-				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext);
-			}
-
-			$captcha = \phpbb_captcha_factory::get_instance($this->config['captcha_plugin']);
+			$captcha_factory = $this->phpbb_container->get('captcha.factory');
+			$captcha = $captcha_factory->get_instance($this->config['captcha_plugin']);
 			$captcha->init(CONFIRM_LOGIN);
 			$vc_response = $captcha->validate($row);
 			if ($vc_response)
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php
index e7764b754b..d32e7504eb 100644
--- a/phpBB/phpbb/auth/provider/ldap.php
+++ b/phpBB/phpbb/auth/provider/ldap.php
@@ -29,10 +29,10 @@ class ldap extends \phpbb\auth\provider\base
 	/**
 	 * LDAP Authentication Constructor
 	 *
-	 * @param 	\phpbb\db\driver\driver_interface		$db
-	 * @param 	\phpbb\config\config		$config
-	 * @param	\phpbb\passwords\manager	$passwords_manager
-	 * @param 	\phpbb\user			$user
+	 * @param	\phpbb\db\driver\driver_interface		$db		Database object
+	 * @param	\phpbb\config\config		$config		Config object
+	 * @param	\phpbb\passwords\manager	$passwords_manager		Passwords manager object
+	 * @param	\phpbb\user			$user		User object
 	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\user $user)
 	{
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 7b71e3c844..c0ce3f1fba 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -91,6 +91,13 @@ class oauth extends \phpbb\auth\provider\base
 	protected $current_uri;
 
 	/**
+	* DI container
+	*
+	* @var \Symfony\Component\DependencyInjection\ContainerInterface
+	*/
+	protected $phpbb_container;
+
+	/**
 	* phpBB root path
 	*
 	* @var string
@@ -98,7 +105,7 @@ class oauth extends \phpbb\auth\provider\base
 	protected $phpbb_root_path;
 
 	/**
-	* PHP extenstion
+	* PHP file extension
 	*
 	* @var string
 	*/
@@ -116,10 +123,11 @@ class oauth extends \phpbb\auth\provider\base
 	* @param	string			$auth_provider_oauth_token_account_assoc
 	* @param	\phpbb\di\service_collection	$service_providers Contains \phpbb\auth\provider\oauth\service_interface
 	* @param	string			$users_table
+	* @param	\Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container DI container
 	* @param	string			$phpbb_root_path
 	* @param	string			$php_ext
 	*/
-	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection $service_providers, $users_table, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection $service_providers, $users_table, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->config = $config;
@@ -130,6 +138,7 @@ class oauth extends \phpbb\auth\provider\base
 		$this->auth_provider_oauth_token_account_assoc = $auth_provider_oauth_token_account_assoc;
 		$this->service_providers = $service_providers;
 		$this->users_table = $users_table;
+		$this->phpbb_container = $phpbb_container;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 	}
@@ -160,7 +169,7 @@ class oauth extends \phpbb\auth\provider\base
 		// Temporary workaround for only having one authentication provider available
 		if (!$this->request->is_set('oauth_service'))
 		{
-			$provider = new \phpbb\auth\provider\db($this->db, $this->config, $this->passwords_manager, $this->request, $this->user, $this->phpbb_root_path, $this->php_ext);
+			$provider = new \phpbb\auth\provider\db($this->db, $this->config, $this->passwords_manager, $this->request, $this->user, $this->phpbb_container, $this->phpbb_root_path, $this->php_ext);
 			return $provider->login($username, $password);
 		}