From a093c28d1adf18d10208f05fca18e2e653f03b80 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 10 Sep 2014 12:01:01 +0200 Subject: [ticket/12963] Fix the list of migrations in database_update.php Without this patch the finder grab all the class available in the ext folder and not only the migrations. This change is backported for the one done before to the cli tool db:migrate. (see the commit 3420f8f3201ac337434f73ee00bda6df7b378212) PHPBB3-12963 --- phpBB/install/database_update.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6a91033dbb..7299c0aa2a 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -181,7 +181,17 @@ $finder = $phpbb_extension_manager->get_finder(); $migrations = $finder ->core_path('phpbb/db/migration/data/') + ->extension_directory('/migrations') ->get_classes(); + +// @deprecated to be removed in 3.2 final +$migrations_deprecated = $phpbb_extension_manager + ->get_finder() + ->extension_directory('/migrations') + ->get_classes(); + +$migrations = array_merge($migrations, $migrations_deprecated); + $migrator->set_migrations($migrations); // What is a safe limit of execution time? Half the max execution time should be safe. -- cgit v1.2.1 From 72ee4b3a7c4fca67cb226dab3ed27a8afa903144 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 10 Sep 2014 12:08:13 +0200 Subject: [ticket/12963] Load extensions migrations from /migration PHPBB3-12963 --- phpBB/install/database_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 7299c0aa2a..f0091ac995 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -177,11 +177,11 @@ $migrator = $phpbb_container->get('migrator'); $migrator->create_migrations_table(); $phpbb_extension_manager = $phpbb_container->get('ext.manager'); -$finder = $phpbb_extension_manager->get_finder(); -$migrations = $finder +$migrations = $phpbb_extension_manager + ->get_finder() ->core_path('phpbb/db/migration/data/') - ->extension_directory('/migrations') + ->extension_directory('/migration') ->get_classes(); // @deprecated to be removed in 3.2 final -- cgit v1.2.1 From 8b16d3141396a11db3ab4ade49af91f2477f5fb6 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 16 Sep 2014 20:18:10 +0200 Subject: [ticket/12963] Edit deprecation message PHPBB3-12963 --- phpBB/install/database_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/database_update.php') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index f0091ac995..5cf01fec79 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -184,7 +184,7 @@ $migrations = $phpbb_extension_manager ->extension_directory('/migration') ->get_classes(); -// @deprecated to be removed in 3.2 final +// @deprecated 3.1.0-RC4 (To be removed: 3.2.0) $migrations_deprecated = $phpbb_extension_manager ->get_finder() ->extension_directory('/migrations') -- cgit v1.2.1