2 files changed, 11 insertions, 17 deletions
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
index 2cc7786046..c3e887841f 100644
--- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
@@ -13,7 +13,9 @@
 
 namespace phpbb\db\migration\data\v30x;
 
-class release_3_0_5_rc1 extends \phpbb\db\migration\migration
+use phpbb\db\migration\container_aware_migration;
+
+class release_3_0_5_rc1 extends container_aware_migration
 {
 	public function effectively_installed()
 	{
@@ -55,9 +57,7 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration
 
 	public function hash_old_passwords()
 	{
-		global $phpbb_container;
-
-		$passwords_manager = $phpbb_container->get('passwords.manager');
+		$passwords_manager = $this->container->get('passwords.manager');
 		$sql = 'SELECT user_id, user_password
 				FROM ' . $this->table_prefix . 'users
 				WHERE user_pass_convert = 1';
diff --git a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
index 58845b88ec..85b90da5fa 100644
--- a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
+++ b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
@@ -13,12 +13,14 @@
 
 namespace phpbb\db\migration\data\v310;
 
+use phpbb\db\migration\container_aware_migration;
+
 /**
  * Migration to convert the Soft Delete MOD for 3.0
  *
  * https://www.phpbb.com/customise/db/mod/soft_delete/
  */
-class soft_delete_mod_convert extends \phpbb\db\migration\migration
+class soft_delete_mod_convert extends container_aware_migration
 {
 	static public function depends_on()
 	{
@@ -115,19 +117,11 @@ class soft_delete_mod_convert extends \phpbb\db\migration\migration
 		}
 	}
 
+	/**
+	 * @return \phpbb\content_visibility
+	 */
 	protected function get_content_visibility()
 	{
-		return new \phpbb\content_visibility(
-			new \phpbb\auth\auth(),
-			$this->config,
-			$this->db,
-			new \phpbb\user('\phpbb\datetime'),
-			$this->phpbb_root_path,
-			$this->php_ext,
-			$this->table_prefix . 'forums',
-			$this->table_prefix . 'posts',
-			$this->table_prefix . 'topics',
-			$this->table_prefix . 'users'
-		);
+		return $this->container->get('content.visibility');
 	}
 }