From 72ee4b3a7c4fca67cb226dab3ed27a8afa903144 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Wed, 10 Sep 2014 12:08:13 +0200
Subject: [ticket/12963] Load extensions migrations from /migration

PHPBB3-12963
---
 phpBB/phpbb/console/command/db/migrate.php |  9 +++++++++
 phpBB/phpbb/extension/base.php             | 12 +++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index c3caae5f70..a25886fb82 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -117,8 +117,17 @@ 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 to be removed in 3.2 final
+		$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 e0ccb4c65b..9cd37ec8b2 100644
--- a/phpBB/phpbb/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
@@ -132,10 +132,20 @@ class base implements \phpbb\extension\extension_interface
 
 		// Only have the finder search in this extension path directory
 		$migrations = $this->extension_finder
-			->extension_directory('/migrations')
+			->extension_directory('/migration')
 			->find_from_extension($this->extension_name, $this->extension_path);
+
 		$migrations = $this->extension_finder->get_classes_from_files($migrations);
 
+		// @deprecated to be removed in 3.2 final
+		$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);
+
 		return $migrations;
 	}
 }
-- 
cgit v1.2.1