diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 01:32:08 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 01:32:08 +0200 |
| commit | 6c043c4a86d3233ea8360fd96f8898c2793f36f5 (patch) | |
| tree | 0b7d83a122e85012a07a90e49a70a7f998630c98 /tests | |
| parent | 7729ae4ad0bb09256709af37f2998a0949fbad01 (diff) | |
| parent | 180f9bf4faedbbc216402c8493258314c7f8ff7d (diff) | |
| download | forums-6c043c4a86d3233ea8360fd96f8898c2793f36f5.tar forums-6c043c4a86d3233ea8360fd96f8898c2793f36f5.tar.gz forums-6c043c4a86d3233ea8360fd96f8898c2793f36f5.tar.bz2 forums-6c043c4a86d3233ea8360fd96f8898c2793f36f5.tar.xz forums-6c043c4a86d3233ea8360fd96f8898c2793f36f5.zip | |
Merge pull request #2964 from nickvergessen/ticket/12963
[ticket/12963] Correctly load migration files from migration/ in tests as well
* nickvergessen/ticket/12963:
[ticket/12963] Correctly load migration files from migration/ in tests as well
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 9 |
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(); |