diff options
author | Cesar G <prototech91@gmail.com> | 2014-09-17 17:49:12 -0700 |
---|---|---|
committer | Cesar G <prototech91@gmail.com> | 2014-09-17 17:49:12 -0700 |
commit | 5a46ed398b75a32d577b920d284516b2b5285971 (patch) | |
tree | 1a55518c59408acb0e40f0fb0afb2286c8b132f4 | |
parent | 92d69255e40d150ab0138f29ead2c266c8f4e6a6 (diff) | |
parent | 53f62f112958a27e5a7a217d5887bdcfe3b91241 (diff) | |
download | forums-5a46ed398b75a32d577b920d284516b2b5285971.tar forums-5a46ed398b75a32d577b920d284516b2b5285971.tar.gz forums-5a46ed398b75a32d577b920d284516b2b5285971.tar.bz2 forums-5a46ed398b75a32d577b920d284516b2b5285971.tar.xz forums-5a46ed398b75a32d577b920d284516b2b5285971.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12963] Fix the migration's finder for the tests (path, new instance)
-rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index 15ab976b02..6b19689b2f 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -70,13 +70,15 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test $finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx); $classes = $finder->core_path('phpbb/') - ->core_directory('/db/migration/data') + ->core_directory('db/migration/data/') ->set_extensions($setup_extensions) - ->extension_directory('migration') + ->extension_directory('/migration') ->get_classes(); // @deprecated 3.1.0-RC4 (To be removed: 3.2.0) + $finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx); $classes_deprecated = $finder + ->set_extensions($setup_extensions) ->extension_directory('/migrations') ->get_classes(); |