2 files changed, 4 insertions, 32 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 dc79071e16..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,16 +13,10 @@
 
 namespace phpbb\db\migration\data\v30x;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use phpbb\db\migration\container_aware_migration;
 
-class release_3_0_5_rc1 extends \phpbb\db\migration\migration implements ContainerAwareInterface
+class release_3_0_5_rc1 extends container_aware_migration
 {
-	/**
-	 * @var ContainerInterface
-	 */
-	protected $container;
-
 	public function effectively_installed()
 	{
 		return phpbb_version_compare($this->config['version'], '3.0.5-RC1', '>=');
@@ -136,12 +130,4 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration implements Contain
 			}
 		}
 	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function setContainer(ContainerInterface $container = null)
-	{
-		$this->container = $container;
-	}
 }
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 c21b75b881..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,21 +13,15 @@
 
 namespace phpbb\db\migration\data\v310;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+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 implements ContainerAwareInterface
+class soft_delete_mod_convert extends container_aware_migration
 {
-	/**
-	 * @var ContainerInterface
-	 */
-	protected $container;
-
 	static public function depends_on()
 	{
 		return array(
@@ -130,12 +124,4 @@ class soft_delete_mod_convert extends \phpbb\db\migration\migration implements C
 	{
 		return $this->container->get('content.visibility');
 	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function setContainer(ContainerInterface $container = null)
-	{
-		$this->container = $container;
-	}
 }