2 files changed, 1 insertions, 18 deletions
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index 68638a9515..86545c237d 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -117,17 +117,9 @@ class migrate extends \phpbb\console\command\command
 		$migrations = $this->extension_manager
 			->get_finder()
 			->core_path('phpbb/db/migration/data/')
-			->extension_directory('/migration')
-			->get_classes();
-
-		// @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
-		$migrations_deprecated = $this->extension_manager
-			->get_finder()
 			->extension_directory('/migrations')
 			->get_classes();
 
-		$migrations = array_merge($migrations, $migrations_deprecated);
-
 		$this->migrator->set_migrations($migrations);
 	}
 
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php
index b74026e6ab..5bb530bad4 100644
--- a/phpBB/phpbb/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
@@ -132,19 +132,10 @@ class base implements \phpbb\extension\extension_interface
 
 		// Only have the finder search in this extension path directory
 		$migrations = $this->extension_finder
-			->extension_directory('/migration')
-			->find_from_extension($this->extension_name, $this->extension_path);
-
-		$migrations = $this->extension_finder->get_classes_from_files($migrations);
-
-		// @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
-		$migrations_deprecated = $this->extension_finder
 			->extension_directory('/migrations')
 			->find_from_extension($this->extension_name, $this->extension_path);
 
-		$migrations_deprecated = $this->extension_finder->get_classes_from_files($migrations_deprecated);
-
-		$migrations = array_merge($migrations, $migrations_deprecated);
+		$migrations = $this->extension_finder->get_classes_from_files($migrations);
 
 		return $migrations;
 	}