diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 01:32:55 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 01:32:55 +0200 |
| commit | 92d69255e40d150ab0138f29ead2c266c8f4e6a6 (patch) | |
| tree | 44e1d20a216f809010a0734de123cc3dcccf5fb6 /tests/test_framework | |
| parent | 45a4cf7ac5c8b0c0028986f9ecd141a828651e46 (diff) | |
| parent | 6c043c4a86d3233ea8360fd96f8898c2793f36f5 (diff) | |
| download | forums-92d69255e40d150ab0138f29ead2c266c8f4e6a6.tar forums-92d69255e40d150ab0138f29ead2c266c8f4e6a6.tar.gz forums-92d69255e40d150ab0138f29ead2c266c8f4e6a6.tar.bz2 forums-92d69255e40d150ab0138f29ead2c266c8f4e6a6.tar.xz forums-92d69255e40d150ab0138f29ead2c266c8f4e6a6.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12963] Correctly load migration files from migration/ in tests as well
Diffstat (limited to 'tests/test_framework')
| -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(); |