aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_database_test_case.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-17 23:33:26 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-17 23:33:26 +0200
commit180f9bf4faedbbc216402c8493258314c7f8ff7d (patch)
tree0b7d83a122e85012a07a90e49a70a7f998630c98 /tests/test_framework/phpbb_database_test_case.php
parent7729ae4ad0bb09256709af37f2998a0949fbad01 (diff)
downloadforums-180f9bf4faedbbc216402c8493258314c7f8ff7d.tar
forums-180f9bf4faedbbc216402c8493258314c7f8ff7d.tar.gz
forums-180f9bf4faedbbc216402c8493258314c7f8ff7d.tar.bz2
forums-180f9bf4faedbbc216402c8493258314c7f8ff7d.tar.xz
forums-180f9bf4faedbbc216402c8493258314c7f8ff7d.zip
[ticket/12963] Correctly load migration files from migration/ in tests as well
PHPBB3-12963
Diffstat (limited to 'tests/test_framework/phpbb_database_test_case.php')
-rw-r--r--tests/test_framework/phpbb_database_test_case.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 46276bcfcb..15ab976b02 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -72,9 +72,16 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
$classes = $finder->core_path('phpbb/')
->core_directory('/db/migration/data')
->set_extensions($setup_extensions)
- ->extension_directory('migrations')
+ ->extension_directory('migration')
->get_classes();
+ // @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
+ $classes_deprecated = $finder
+ ->extension_directory('/migrations')
+ ->get_classes();
+
+ $classes = array_merge($classes, $classes_deprecated);
+
$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_data = $schema_generator->get_schema();